diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-10-14 01:00:34 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-10-14 01:02:52 +0300 |
commit | 9dbe6b40d07df41255f0c8fda6895000b7c7e1a6 (patch) | |
tree | 7a8cca3e9852fbde894710c4f1904ef833789865 /doc | |
parent | a37103f89c20e6b30d1f739233be006dcff340ee (diff) | |
download | pies-9dbe6b40d07df41255f0c8fda6895000b7c7e1a6.tar.gz pies-9dbe6b40d07df41255f0c8fda6895000b7c7e1a6.tar.bz2 |
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}.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/Makefile.am | 2 | ||||
-rw-r--r-- | doc/pies.texi | 20 |
2 files changed, 19 insertions, 3 deletions
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: | |||
54 | $(info_TEXINFOS) | 54 | $(info_TEXINFOS) |
55 | 55 | ||
56 | check-sub-config: | 56 | check-sub-config: |
57 | sed -n '/pies_keywords\[\] *= *{/,/^}/{p}' ../src/pies.c|tr '\n{' ' \n'|sed -n '/grecs_type_section/s/"\([^"]*\)".*grecs_type_section,[^,]*,[^,]*,[^,]*,[^,]*, *\(.*\) *}.*/\1 \2/p' | \ | 57 | @sed -n '/pies_keywords\[\] *= *{/,/^}/{p}' ../src/pies.c|tr '\n{' ' \n'|sed -n '/grecs_type_section/s/"\([^"]*\)".*grecs_type_section,[^,]*,[^,]*,[^,]*,[^,]*, *\(.*\) *}.*/\1 \2/p' | \ |
58 | while read ident kw; do \ | 58 | while read ident kw; do \ |
59 | check-docs.sh "$$ident configuration statements" \ | 59 | check-docs.sh "$$ident configuration statements" \ |
60 | "/$$kw"'\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \ | 60 | "/$$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}: | |||
831 | @item package @tab Package name (@samp{Pies}). | 831 | @item package @tab Package name (@samp{Pies}). |
832 | @item version @tab Package version (@value{VERSION}). | 832 | @item version @tab Package version (@value{VERSION}). |
833 | @item component @tab Name of the terminated component. | 833 | @item component @tab Name of the terminated component. |
834 | @item retcode @tab Component exit code, in decimal. | 834 | @item termination @tab Termination cause (see below). |
835 | @item retcode @tab Component exit code (or signal number, if exited | ||
836 | on signal), in decimal. | ||
835 | @end multitable | 837 | @end multitable |
836 | 838 | ||
839 | The @samp{termination} variable is set so as to facilitate its use | ||
840 | with the @samp{retcode} variable. Namely, its value is @samp{exited | ||
841 | with}, if the component exited and @samp{terminated on signal}, if | ||
842 | the component terminated on a signal. Thus, using | ||
843 | |||
844 | @smallexample | ||
845 | $@{termination@} $@{retcode@} | ||
846 | @end smallexample | ||
847 | |||
848 | @noindent | ||
849 | results in a correct English sentence. This message, however, cannot | ||
850 | be properly internationalized. This will be fixed in the future | ||
851 | versions. | ||
852 | |||
837 | If @code{message} statement is not given, the following default | 853 | If @code{message} statement is not given, the following default |
838 | message is used instead: | 854 | message is used instead: |
839 | 855 | ||
840 | @smallexample | 856 | @smallexample |
841 | From: <> | 857 | From: <> |
842 | X-Agent: $@{canonical-program-name@} ($@{package@} $@{version@}) | 858 | X-Agent: $@{canonical-program-name@} ($@{package@} $@{version@}) |
843 | Subject: Component $@{component@} terminated with code $@{retcode@}. | 859 | Subject: Component $@{component@} $@{termination@} $@{retcode@}. |
844 | 860 | ||
845 | @end smallexample | 861 | @end smallexample |
846 | @end deffn | 862 | @end deffn |