Document %h and fix #1694 about %s and %v

diff --git a/docs/manuals/en/main/dirdconf.tex b/docs/manuals/en/main/dirdconf.tex
index 02d5d66b243708e47101ec276dd62837cca2eedc..ecca70cfdc47e0141db618abdf63c6fe11ff7cbd 100644 (file)
--- a/docs/manuals/en/main/dirdconf.tex
+++ b/docs/manuals/en/main/dirdconf.tex
@@ -1139,6 +1139,7 @@ Console          &       &          & Console command\\
     %c = Client's name
     %d = Director's name
     %e = Job Exit Status
+    %h = Client address
     %i = JobId
     %j = Unique Job id
     %l = Job Level
@@ -1150,7 +1151,8 @@ Console          &       &          & Console command\\
 \end{verbatim}
 \normalsize
 
-The Job Exit Status code \%e edits the following values:
+Some character substitutions are not available in all situations. The Job Exit
+Status code \%e edits the following values:
 
 \index[dir]{Exit Status}
 \begin{itemize}

diff --git a/docs/manuals/en/main/messagesres.tex b/docs/manuals/en/main/messagesres.tex
index 784602c76d2e010835a230fc4f0f2b4b9b5a64a4..c2e393a5fa6c8c9bb48b2b0a393d47ea7dca2511 100644 (file)
--- a/docs/manuals/en/main/messagesres.tex
+++ b/docs/manuals/en/main/messagesres.tex
@@ -90,12 +90,15 @@ specified as a quoted string, the following substitutions will be used:
 \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{itemize}
 
 Please note: any {\bf MailCommand} directive must be specified 

diff --git a/docs/manuals/en/main/newfeatures.tex b/docs/manuals/en/main/newfeatures.tex
index 09aa4be5e27db066db2c71b71f6d5f5cc091d1ea..66f004afcd6d9b9435c75afa041ff18cc413b759 100644 (file)
--- a/docs/manuals/en/main/newfeatures.tex
+++ b/docs/manuals/en/main/newfeatures.tex
@@ -416,11 +416,11 @@ This project was funded by Bacula Systems and is available with Bacula
 Enterprise Edition and Community Edition.
 
 \section{Additions to RunScript variables}
-You can have access to JobBytes and JobFiles using %b and %f in your runscript
-command.
+You can have access to JobBytes and JobFiles using \%b and \%f in your runscript
+command. The Client address is now available through \%h.
 
 \begin{verbatim}
-RunAfterJob = "/bin/echo Job=%j JobBytes=%b JobFiles=%f"
+RunAfterJob = "/bin/echo Job=%j JobBytes=%b JobFiles=%f ClientAddress=%h"
 \end{verbatim}
 
 %\section{Changes in drivetype.exe}