Add documentation about MailCommand variables

diff --git a/docs/manuals/en/main/messagesres.tex b/docs/manuals/en/main/messagesres.tex
index 8ea94df110bb35b380b81b1e0073faf902ead63b..aedb12c0c4a070dddbcecc44e96715287485be16 100644 (file)
--- a/docs/manuals/en/main/messagesres.tex
+++ b/docs/manuals/en/main/messagesres.tex
@@ -87,21 +87,28 @@ However, by using the {\bf MailCommand}, you can specify exactly how to
 send the mail.  During the processing of the {\bf command} part, normally
 specified as a quoted string, the following substitutions will be used:
 
-\begin{bsysitemize}
-\item \%\% = \%
-\item \%c = Client's name
-\item \%d = Director's name
-\item \%e = Job Exit code (OK, Error, ...)
-\item \%h = Client address
-\item \%i = Job Id
-\item \%j = Unique Job name
-\item \%l = Job level
-\item \%n = Job name
-\item \%r = Recipients
-\item \%s = Since time
-\item \%t = Job type (e.g. Backup, ...)
-\item \%v = Volume name (Only on director side)
-\end{bsysitemize}
+\begin{verbatim}
+    %% = %
+    %b = Job Bytes
+    %c = Client's name
+    %d = Daemon's name (Such as host-dir or host-fd)
+    %D = Director's name (Also valid on file daemon)
+    %e = Job Exit Status
+    %f = Job FileSet (Only on director side)
+    %F = Job Files
+    %h = Client address
+    %i = JobId
+    %j = Unique Job id
+    %l = Job Level
+    %n = Job name
+    %p = Pool name (Only on director side)
+    %P = Current PID process
+    %s = Since time
+    %t = Job type (Backup, ...)
+    %v = Volume name (Only on director side)
+    %w = Storage name (Only on director side)
+    %x = Spooling enabled? ("yes" or "no")
+\end{verbatim}
 
 Please note: any {\bf MailCommand} directive must be specified
 in the {\bf Messages} resource {\bf before} the desired

diff --git a/docs/manuals/en/main/newfeatures.tex b/docs/manuals/en/main/newfeatures.tex
index 740a4187bb60abbea5ab25bd625c759ca08d212c..1e449d39e617d179a9c8d0e017634569fa4349f4 100644 (file)
--- a/docs/manuals/en/main/newfeatures.tex
+++ b/docs/manuals/en/main/newfeatures.tex
@@ -2,6 +2,27 @@
 This chapter presents the new features that have been added to the next
 Community version of \mbacula{} that is not yet released.
 
+\section{New Features in 5.2.14}
+
+\subsection{Director job Codes in Message Resource Commands}
+Before submitting the specified mail command to the operating system, Bacula
+performs character substitution like in Runscript commands. Bacula will now
+perform also specific Director character substitution.
+
+\smallskip{}
+The code for this feature was contributed by Bastian Friedrich.
+
+\subsection{Additions to RunScript variables}
+The following variables are now available in runscripts:
+\begin{itemize}
+\item current PID using \%P
+\item if the job is a clone job using \%C
+\end{itemize}
+
+\begin{verbatim}
+RunAfterJob = "/bin/echo Pid=%P isCloned=%C" 
+\end{verbatim}
+
 \section{New Features in 5.2.2}
 This chapter presents the new features that have been added to the current
 Community version of \mbacula{} that is now released.