Update

git-svn-id: file:///svnroot/mailfromd/trunk@1408 7a8a7f39-df28-0410-adc6-e0d955640f24

1 files changed, 14 insertions, 12 deletions

diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi
index 553c3498..54c22030 100644
--- a/doc/mailfromd.texi
+++ b/doc/mailfromd.texi
@@ -1038,7 +1038,7 @@ processing each message, the @acronym{MTA} installs communication with
 necessary data from the sender.  At each state it sends the relevant
 information to @command{mailfromd}, and waits for it to reply.  The 
 @command{mailfromd} filter receives the message data through
-@dfn{Sendmail macros} and runs a @dfn{configuration program}
+@dfn{Sendmail macros} and runs a @dfn{handler program}
 defined for the given state.  The result of this run is a @dfn{response
 code}, that it returns to the @acronym{MTA}:
 
@@ -3049,7 +3049,7 @@ amount of white-space characters (i.e. spaces, tabulations or newlines).
 @section Comments
 
 @cindex Comments 
-  Two types of comments are allowed: C-style, enclosed between
+  Two types of comments are allowed: @sc{c}-style, enclosed between
 @samp{/*} and @samp{*/}, and shell-style, starting with @samp{#}
 character and extending up to the end of line:
 
@@ -3070,7 +3070,7 @@ following @samp{#} are not ignored.
 @kwindex #include
   If @samp{#} is followed by word @samp{include} (with
 optional whitespace between them), this statement requires inclusion
-of the specified file, as in C.  There are two forms of the
+of the specified file, as in @sc{c}.  There are two forms of the
 @samp{#include} statement:
 
 @enumerate 1
@@ -3411,7 +3411,9 @@ scripts.  @xref{tracing runtime errors}, for the detailed description.
 @deffn {pragma option} user @var{string}
 @xprindex{user}
   Switch to this user's privileges after startup.
-@FIXME{Describe it. Refer to --group.} 
+@xref{Starting and Stopping}, for the discussion of
+the privileges @command{mailfromd} runs under and the options that
+affect them.  See also @code{group} below. 
 @end deffn
 
 @deffn {pragma option} group @var{string}
@@ -3422,7 +3424,7 @@ supplementary groups when switching to user privileges, this option
 allows to retain the given group.  It can be specified multiple times
 to retain several groups.  Use of this option can be necessary to
 maintain proper access rights for various files.  @xref{Starting and
-Stopping}. 
+Stopping}.  
 @end deffn
 
   The following options control interaction with @command{Sendmail}:
@@ -7959,7 +7961,7 @@ in the formal definition above.  If @var{label} is supplied, the
 statement terminates the loop statement marked with that label.  This
 allows to break from nested loops.
 
-  It is similar to @code{break} statement is C or shell.
+  It is similar to @code{break} statement in @sc{c} or shell.
   
 @item next [@var{label}]
   Initiates next iteration of the loop.  Control passes to @samp{2} in
@@ -7970,7 +7972,7 @@ loop from a nested loop statement.
 @end table
 
   The @code{loop} statement can be used to create iterative statements
-of arbitrary complexity.  Let's illustrate it in comparison with C.
+of arbitrary complexity.  Let's illustrate it in comparison with @sc{c}.
 
 @cindex infinite loop
 @cindex loop, infinite
@@ -7993,7 +7995,7 @@ somewhere in @var{stmt-list}.
 @cindex loop, while-style
 @cindex while loop
   The following statement is equivalent to @code{while (@var{expr1})
-@var{stmt-list}} in C:
+@var{stmt-list}} in @sc{c}:
  
 @smallexample
 @group
@@ -8006,7 +8008,7 @@ done
 
 @cindex loop, for-style
 @cindex for loop
-  The C construct @code{for (@var{expr1}; @var{expr2}; @var{expr3})}
+  The @sc{c} construct @code{for (@var{expr1}; @var{expr2}; @var{expr3})}
 is written in @acronym{MFL} as follows:
 
 @smallexample
@@ -8031,7 +8033,7 @@ done
 
 @cindex loop, do-style
 @cindex do loop
-  Finally, the C @samp{do} loop is implemented as follows:                 
+  Finally, the @sc{c} @samp{do} loop is implemented as follows: 
 
 @smallexample
 @group
@@ -9401,7 +9403,7 @@ the following options: @option{--compact}, @option{--delete},
 
 @opsummary{source-info}
 @item --source-info
-Include C source information into the debugging messages.  You would
+Include @sc{c} source information in debugging messages.  You do
 not need this option, unless you are developing and debugging
 @command{mailfromd}. 
 
@@ -9472,7 +9474,7 @@ Print program version.
 @cindex groups
 @cindex supplementary groups
   Right after startup, when @command{mailfromd} has done the
-operations that requires root privileges, it switches to the privileges
+operations that require root privileges, it switches to the privileges
 of the user it is configured to run as (@pxref{default user privileges}) or
 the one given in its script file (@pxref{pragma user}).  During
 this process it will drop all supplementary groups and switch to the