Finish the docs.

* doc/inetd.texi: Update.
* doc/pies.texi: Update.

2 files changed, 116 insertions, 74 deletions

diff --git a/doc/inetd.texi b/doc/inetd.texi
index a1c5f8a..c7c8bbb 100644
--- a/doc/inetd.texi
+++ b/doc/inetd.texi
@@ -107,7 +107,7 @@ Servers using stream sockets generally are multi-threaded and use the
 accepted by @command{pies}, and the server is given only the
 newly-accepted socket connected to a client of the service.  Most
 stream-based services and all TCPMUX services operate in this manner.
-For such services, the invocation rate may be limitied by specifying
+For such services, the invocation rate may be limited by specifying
 optional @samp{max-rate} suffix (a decimal number), e.g.:
 @samp{nowait.15}. 
 
@@ -187,14 +187,13 @@ causes any previous default address specifier to be forgotten.
 
 An example of @file{inetd.conf} file with various services follows:
 
-@example
+@smallexample
 ftp            stream  tcp nowait root  /usr/libexec/ftpd    ftpd -l
 ntalk          dgram   udp wait   root  /usr/libexec/ntalkd  ntalkd
 tcpmux         stream  tcp nowait root  internal
 tcpmux/+scp-to stream  tcp nowait guest /usr/sbin/in.wydawca wydawca
 tcpmux/docref  stream  tcp nowait guest /usr/bin/docref      docref
-@end example
-
+@end smallexample
 
      
 
diff --git a/doc/pies.texi b/doc/pies.texi
index db438c6..04c85a4 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -85,7 +85,7 @@ documents @command{pies} Version @value{VERSION}.
 * Dependencies::
 * Pies Configuration File::
 * Pies Debugging::
-* Configuration Example::
+* Configuration Examples::
 * Command Line Usage::
 * Invocation::
 * Reporting Bugs::
@@ -106,8 +106,8 @@ Pies Configuration File
 * Component Statement::
 * Notification::         Mail Notification
 * ACL::                  Access Control Lists
-* inetd::
-* include-meta1::
+* inetd::                Using @command{inetd} Configuration Files
+* include-meta1::        Using @command{meta1} Configuration Files
 * Global Configuration::
 * Pies Privileges::
 * State Files::
@@ -132,11 +132,12 @@ Component Statement
 
 Inetd-Style Components
 
-* builtin:: Built-in Inetd Services
-* TCPMUX:: TCPMUX Services
-* sockenv:: Socket Environment Variables
+* builtin::    Built-in Inetd Services
+* TCPMUX::     TCPMUX Services
+* sockenv::    Socket Environment Variables
+* inetd exit:: Exit Actions in Inetd Components
 
-Configuration Example
+Configuration Examples
 
 * Simple Pies::
 * Hairy Pies::
@@ -164,7 +165,7 @@ redirected to a file or to an arbitrary @command{syslog} channel.
 
 @anchor{init-style}
 @cindex init-style components
-  This way of operation applies to the @dfn{init-style}
+  This way of operation applies to @dfn{init-style}
 components, called so because of the similarity with the
 @command{init} process manager.  @command{Pies} is also able to handle
 components that receive input on their @samp{stdin} and send reply to
@@ -185,11 +186,12 @@ the @command{inetd} utility.
 
 @anchor{meta1-style}
 @cindex meta1-style components
+@cindex pass-style components
 @cindex smtps
   Yet another type of components supported by @command{pies} are
-@dfn{meta1-style} components.  As its name suggests, this type is
-designed expressly as a support for MeTA1@footnote{See
-@uref{http://www.meta1.org}} components, namely
+@dfn{pass-style} or @dfn{meta1-style} components.  As the name
+suggests, this type is designed expressly as a support for
+MeTA1@footnote{See @uref{http://www.meta1.org}} components, namely
 @command{smtps}.  This type can be regarded as a mixture of the above
 two.  For each meta1-style component @command{pies} opens a socket
 after start-up, and starts the component binary.  Once the component
@@ -209,10 +211,12 @@ simultaneously.
 
   Components are started in the order of their appearance in the
 configuration file and terminated in reverse order.  The same
-ordering applies when starting or stopping a component dependencies, 
+ordering applies when starting or stopping component dependencies, 
 
   As an exception, this order is reversed for the components read from
-files included by @code{include-meta1} statement (@pxref{include-meta1}).
+MeTA1 configuration files, either included by @code{include-meta1}
+statement (@pxref{include-meta1}) or expressly supplied in the command
+line (@pxref{config syntax}).
 
 @node Dependencies
 @chapter Inter-Component Dependencies
@@ -228,7 +232,7 @@ startup.  Components @samp{B} and @samp{C} are called
 
   Before restarting any component, @command{pies} verifies if it is a
 prerequisite for any other components.  If so, it first terminates its
-dependencies, then restarts the component, and then starts its
+dependencies, restarts the component, and then starts its
 dependencies again, in the order of their appearance in the
 configuration file.
 
@@ -242,9 +246,9 @@ or more @dfn{configuration files}.  The default configuration file
 is named @file{pies.conf} and is located in the @dfn{system
 configuration directory} (in most cases @file{/etc} or
 @file{/usr/local/etc}, depending on how the package was compiled).
-This file uses the @dfn{native Pies configuration syntax}.  The
-program also understands configuration files in @dfn{inetd} and
-@dfn{meta1} formats.
+This file uses the @dfn{native Pies configuration syntax}.  Apart from
+this format, the program also understands configuration files in
+@dfn{inetd} and @dfn{meta1} formats.
 
   Alternative configuration files may be specified using @option{--config-file}
 (@option{-c} command line option), e.g.:
@@ -279,8 +283,11 @@ pies /etc/pies.conf \
 @end group
 @end smallexample
 
+@xopindex{config-help, introduced}
   The rest of this chapter concerns the @command{pies} native
-configuration file format.  The use of inetd configuration files is
+configuration file format.  You can receive a concise summary of all
+configuration directives any time by running @command{pies
+--config-help}.  The use of inetd configuration files is
 covered in @ref{inetd} and the use of meta1 configuration files
 is described in @ref{include-meta1} 
  
@@ -300,18 +307,13 @@ if no errors were detected, and with status 78 otherwise.
 configuration without actually parsing it, use @option{-E} command
 line option.
 
-@xopindex{config-help, introduced}
-  The rest of this section describes the configuration file syntax in
-detail.  You can receive a concise summary of all configuration
-directives any time by running @command{pies --config-help}.
-
 @menu
 * Syntax::               Configuration File Syntax
 * Component Statement::
 * Notification::         Mail Notification
 * ACL::                  Access Control Lists
-* inetd::
-* include-meta1::
+* inetd::                Using @command{inetd} Configuration Files
+* include-meta1::        Using @command{meta1} Configuration Files
 * Global Configuration::
 * Pies Privileges::
 * State Files::
@@ -361,9 +363,8 @@ occurrence of @samp{*/} (star, slash).
 @cindex statement, simple
 @cindex simple statements
   A @dfn{simple statement} consists of a keyword and value
-separated by any amount of whitespace.  The simple statement is terminated
-with a semicolon (@samp{;}), unless it contains a @dfn{here-document}
-(see below), in which case the semicolon is optional.
+separated by any amount of whitespace.  The statement is terminated
+with a semicolon (@samp{;}).
 
   Examples of simple statements are:
 
@@ -573,7 +574,7 @@ symbols may be undefined using the following command line options:
 @cindex @option{-D}
 @item --define=@var{sym}[=@var{value}]
 @itemx -D @var{symbol}[=@var{value}]
-Define symbol @var{sym} as having @var{value}, or emtpy, if
+Define symbol @var{sym} as having @var{value}, or empty, if
 the @var{value} is not given.
 
 @xopindex{undefine, described}
@@ -598,7 +599,8 @@ component @var{tag} @{
 @end smallexample
 
 The component is identified by its @dfn{tag}, which is given as
-argument to the @code{component} keyword.
+argument to the @code{component} keyword.  Component declarations with
+the same tags are merged into a single declaration.
 
 The following are the basic statements which are allowed within the
 @code{component} block:
@@ -732,7 +734,7 @@ component tags.
 @node Component Privileges
 @subsection Component Privileges