From 9dbe6b40d07df41255f0c8fda6895000b7c7e1a6 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Wed, 14 Oct 2009 01:00:34 +0300
Subject: Minor changes.

* doc/Makefile.am (check-sub-config): Silent the rule.
* doc/pies.texi: Update.
* src/progman.c (default_termination_message): Use ${termination}
(notify): Fix wording in ${termination}.
---
 doc/Makefile.am |  2 +-
 doc/pies.texi   | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d7d69d1..fec8df3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -54,7 +54,7 @@ check-config:
 		$(info_TEXINFOS) 
 
 check-sub-config:
-	sed -n '/pies_keywords\[\] *= *{/,/^}/{p}' ../src/pies.c|tr  '\n{' ' \n'|sed -n '/grecs_type_section/s/"\([^"]*\)".*grecs_type_section,[^,]*,[^,]*,[^,]*,[^,]*, *\(.*\) *}.*/\1 \2/p' | \
+	@sed -n '/pies_keywords\[\] *= *{/,/^}/{p}' ../src/pies.c|tr  '\n{' ' \n'|sed -n '/grecs_type_section/s/"\([^"]*\)".*grecs_type_section,[^,]*,[^,]*,[^,]*,[^,]*, *\(.*\) *}.*/\1 \2/p' | \
         while read ident kw; do \
 	   check-docs.sh "$$ident configuration statements" \
 	   "/$$kw"'\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
diff --git a/doc/pies.texi b/doc/pies.texi
index 3f9ec4b..e1ca650 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -831,16 +831,32 @@ The following macro-variables are expanded within @var{string}:
 @item package    @tab Package name (@samp{Pies}).
 @item version    @tab Package version (@value{VERSION}).
 @item component  @tab Name of the terminated component.
-@item retcode    @tab Component exit code, in decimal.
+@item termination @tab Termination cause (see below).
+@item retcode    @tab Component exit code (or signal number, if exited
+on signal), in decimal.
 @end multitable
 
+The @samp{termination} variable is set so as to facilitate its use
+with the @samp{retcode} variable.  Namely, its value is @samp{exited
+with}, if the component exited and @samp{terminated on signal}, if
+the component terminated on a signal.  Thus, using
+
+@smallexample
+$@{termination@} $@{retcode@}
+@end smallexample
+
+@noindent
+results in a correct English sentence.  This message, however, cannot
+be properly internationalized.  This will be fixed in the future
+versions.
+
 If @code{message} statement is not given, the following default
 message is used instead:
 
 @smallexample
 From: <>
 X-Agent: $@{canonical-program-name@} ($@{package@} $@{version@})
-Subject: Component $@{component@} terminated with code $@{retcode@}.
+Subject: Component $@{component@} $@{termination@} $@{retcode@}.
 
 @end smallexample
 @end deffn
-- 
cgit v1.2.1