From 016a2de87593b72f9e9ab7aa5fd0025bf26d86eb Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Fri, 18 Feb 2011 09:44:18 +0100
Subject: [PATCH] Document %h and fix #1694 about %s and %v

---
 docs/manuals/en/main/dirdconf.tex    | 4 +++-
 docs/manuals/en/main/messagesres.tex | 3 +++
 docs/manuals/en/main/newfeatures.tex | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/manuals/en/main/dirdconf.tex b/docs/manuals/en/main/dirdconf.tex
index 02d5d66b..ecca70cf 100644
--- 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 784602c7..c2e393a5 100644
--- 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 09aa4be5..66f004af 100644
--- 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}
-- 
2.39.2