Update the default templates - they were a bit rough.

diff --git a/etc/templates/notify-blocked.txt b/etc/templates/notify-blocked.txt
index a1224d868fdb99f06ed52ad843a3928a93aef460..d21061a514dfaef7263f98f54eff9f12c429865a 100644 (file)
--- a/etc/templates/notify-blocked.txt
+++ b/etc/templates/notify-blocked.txt
@@ -4,7 +4,7 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
-is delayed in the scheduling queues because:
+Your job to $number is delayed in the scheduling queues because:
 
 $faxstatus
 

diff --git a/etc/templates/notify-done-page.txt b/etc/templates/notify-done-page.txt
index 54c24d858cc4be85bea8c05e418783032940dfcb..23e03bde7f92bada35f2940004535d82b71731a6 100644 (file)
--- a/etc/templates/notify-done-page.txt
+++ b/etc/templates/notify-done-page.txt
@@ -4,7 +4,7 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
- was completed successfully.
+Your page to $number was completed successfully.
           Dialogs: $tottries (exchanges with remote device)
             Calls: $totdials (total phone calls placed)
             Modem: $modem

diff --git a/etc/templates/notify-done.txt b/etc/templates/notify-done.txt
index 6a24191a1be79e151b333cc5f328227e619ea9b2..684e9abfaa8715a3b68f89aeeea3d429eec71ddf 100644 (file)
--- a/etc/templates/notify-done.txt
+++ b/etc/templates/notify-done.txt
@@ -4,7 +4,7 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
-Your $THISJOBTYPE job to $number  was completed successfully.
+Your job to $number was completed successfully.
             Pages: $npages
          Receiver: $csi
           Quality: $resolution

diff --git a/etc/templates/notify-failed-page.txt b/etc/templates/notify-failed-page.txt
index 1e08226aaa06ad3a661941918f7dc5920992b2f9..d9f0392d1d7f5be884f03ba190d4f42ff92ce071 100644 (file)
--- a/etc/templates/notify-failed-page.txt
+++ b/etc/templates/notify-failed-page.txt
@@ -4,7 +4,7 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
-failed because:
+Your job to $number failed because:
 
 $faxstatus
 

diff --git a/etc/templates/notify-failed.txt b/etc/templates/notify-failed.txt
index 168eab6fb1577ee0a4d6ecf97eb99a6ea45dc473..fce33854d60b0fd9b6d625f2f1cfdacda3af2f2b 100644 (file)
--- a/etc/templates/notify-failed.txt
+++ b/etc/templates/notify-failed.txt
@@ -3,7 +3,7 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
-failed because:
+Your job to $number failed because:
 
 $faxstatus
 

diff --git a/etc/templates/notify-format_failed.txt b/etc/templates/notify-format_failed.txt
index 58720c2cea00189a8c03197fffe8a948c4b0fa19..e9bc771e55358296f2c5fb3c4dcc63610134774f 100644 (file)
--- a/etc/templates/notify-format_failed.txt
+++ b/etc/templates/notify-format_failed.txt
@@ -4,12 +4,13 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
- was not sent because document conversion
-to facsimile failed.  The output from the converter program was:
+Your job to $number was not sent because document conversion
+failed.  The output from the converter program was:
 
 $faxstatus
 
 Check any PostScript documents for non-standard fonts and invalid constructs
+
 ------- Unsent job status -------
       Destination: $number
             JobID: $jobid

diff --git a/etc/templates/notify-killed.txt b/etc/templates/notify-killed.txt
index 9e12127f75f7504a14bd5619039b56c7edd786ef..28d7508cdf6e549bc854ed0b224c1ef73a26fade 100644 (file)
--- a/etc/templates/notify-killed.txt
+++ b/etc/templates/notify-killed.txt
@@ -4,7 +4,8 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
-was deleted from the queue.
+You job to $number was deleted from the queue.
+
 ------- Unsent job status -------
       Destination: $number
             JobID: $jobid

diff --git a/etc/templates/notify-no_formatter.txt b/etc/templates/notify-no_formatter.txt
index e5fa6dbb8963a851454a1ae947f777aab0a79b60..da32d7a491b6b41112af2329afe095610da7f275 100644 (file)
--- a/etc/templates/notify-no_formatter.txt
+++ b/etc/templates/notify-no_formatter.txt
@@ -5,7 +5,9 @@ Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
  
-the document conversion script was not found.
+Your job to $number failed because the document conversion script was
+not found.
+
 ------- Unsent job status -------
       Destination: $number
             JobID: $jobid

diff --git a/etc/templates/notify-poll_failed.txt b/etc/templates/notify-poll_failed.txt
index 27f33fd9bc0c8a5f5690d203cbf75e048224bae3..feb127203256759287366e7f62a5a1b4da0187a6 100644 (file)
--- a/etc/templates/notify-poll_failed.txt
+++ b/etc/templates/notify-poll_failed.txt
@@ -4,7 +4,7 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
-, a polling request,\ncould not be completed because 
+Your polling request could not be completed because 
 an unspecified problem occurred.
 
 Processing time was $JTIME.

diff --git a/etc/templates/notify-poll_no_document.txt b/etc/templates/notify-poll_no_document.txt
index 258f609b39a456fd14a525245e97174887dd096d..5dbd755d00407ed77f0ccf0391ab1dd9c9773fb2 100644 (file)
--- a/etc/templates/notify-poll_no_document.txt
+++ b/etc/templates/notify-poll_no_document.txt
@@ -4,7 +4,7 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
-, a polling request,\ncould not be completed because 
+Your polling request could not be completed because 
 no document was available for retrieval.
 
 Processing time was $JTIME.

diff --git a/etc/templates/notify-poll_rejected.txt b/etc/templates/notify-poll_rejected.txt
index e3b2e209610f9ad9fe773082a95be518bd5b8614..9467b46da18b90d74e39c5f5168c8e59b6b53a59 100644 (file)
--- a/etc/templates/notify-poll_rejected.txt
+++ b/etc/templates/notify-poll_rejected.txt
@@ -4,7 +4,7 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
-, a polling request,\ncould not be completed because 
+Your polling request could not be completed because 
 the remote side rejected your request.
 
 Processing time was $JTIME.

diff --git a/etc/templates/notify-reject.txt b/etc/templates/notify-reject.txt
index e1c7df40460b200a8a614962dde11095cafc50e0..78fd08cd09e0dc4413e4e3972ed3f566ff1a18da 100644 (file)
--- a/etc/templates/notify-reject.txt
+++ b/etc/templates/notify-reject.txt
@@ -4,7 +4,7 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
-was rejected because:
+Your job to $number was rejected because:
 
 $faxstatus
 

diff --git a/etc/templates/notify-removed.txt b/etc/templates/notify-removed.txt
index 37179c36e4238733d433e6ce32195f4bd62ff1d1..b4006f31f91dd325732db5617ae36b2d21a1cfef 100644 (file)
--- a/etc/templates/notify-removed.txt
+++ b/etc/templates/notify-removed.txt
@@ -4,4 +4,4 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
-was deleted from the queue.
+Your job to $number was deleted from the queue.

diff --git a/etc/templates/notify-requeued.txt b/etc/templates/notify-requeued.txt
index 3c1a34da0e70fa19ecf9c4fae6a81e19fffbdd22..cc4ba07fa0c88bd5393e093997862933164bd3eb 100644 (file)
--- a/etc/templates/notify-requeued.txt
+++ b/etc/templates/notify-requeued.txt
@@ -4,7 +4,7 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
-was not sent because:
+Your job to $number was not sent because:
 
 $faxstatus
 

diff --git a/etc/templates/notify-timedout.txt b/etc/templates/notify-timedout.txt
index ab7793d2bb28172f571b0e7ae38cb680ac46ead9..d63b0bb01a0394cd39b11970f87a0e66e0a084d0 100644 (file)
--- a/etc/templates/notify-timedout.txt
+++ b/etc/templates/notify-timedout.txt
@@ -4,7 +4,9 @@ From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: Quoted-Printable
 
-could not be completed before the appointed deadline.
+Your job to $number could not be completed before the appointed
+deadline.
+
 ------- Unsent job status -------
       Destination: $number
             JobID: $jobid