Update

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

2 files changed, 12 insertions, 7 deletions

diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi
index fbbf7a58..07a0d8ad 100644
--- a/doc/mailfromd.texi
+++ b/doc/mailfromd.texi
@@ -1112,7 +1112,7 @@ The diagram below shows the control flow when processing an
 @acronym{SMTP} transaction.  Lines marked with @code{C:} show
 @acronym{SMTP} commands issued by the remote machine (the
 @dfn{client}), those marked with @samp{@result{}} show called handlers
-with their arguments.  An @r{[R]} appearing at the start of a line
+with their arguments.  An @samp{[R]} appearing at the start of a line
 indicates that this part of the transaction can be repeated any number
 of times:
 
@@ -1129,25 +1129,25 @@ do
         C: MAIL FROM @var{sender}
         @result{} envfrom(@var{sender})
         
-@r{[R]} C: RCPT TO @var{recipient}                  
+[R]     C: RCPT TO @var{recipient}                  
         @result{} envrcpt(@var{recipient})
 
         C: DATA
-@r{[R]} C: @var{header}: @var{value}                
+[R]     C: @var{header}: @var{value}                
         @result{} header(@var{header}, @var{value})
         
         C:
         @result{} eoh()
 
-@r{[R]} C: @var{body-line}                          
-        @result{} /* @r{Collect lines into blocks @var{blk} of
-        @result{}  * at most @var{len} bytes and call:}
+[R]     C: @var{body-line}                          
+        @result{} /* @r{Collect lines into blocks @var{blk} of}
+        @result{}  * @r{at most @var{len} bytes and call:}
         @result{}  */
         @result{} body(@var{blk}, @var{len})
         
         C: .
         @result{} eom()
- done
+done
 @result{} end() 
 @end group
 @end smallexample
diff --git a/doc/mtasim.texi b/doc/mtasim.texi
index 580689c7..8e5f66f8 100644
--- a/doc/mtasim.texi
+++ b/doc/mtasim.texi
@@ -334,6 +334,11 @@ terminates with exit code 1.  The error message it prints looks like:
 Expected 250 but got 470
 @end smallexample
 
+  The expect code given with the @code{\E} command may have less than
+3 digits.  In this case it specifies the first digits of expected
+reply.  For example, the command @samp{\E2} matches replies
+@samp{200}, @samp{220}, etc. 
+
   This feature can be used to automate your tests.  For example, the
 following script tests the greylisting functionality (see the previous
 section):