Fix docs

1 files changed, 14 insertions, 14 deletions

diff --git a/doc/upgrade.texi b/doc/upgrade.texi
index 1bcc2da7..2c59e963 100644
--- a/doc/upgrade.texi
+++ b/doc/upgrade.texi
@@ -26,20 +26,19 @@ between the consecutive Mailfromd releases.
 @node 5x0-600
 @appendixsec Upgrading from 5.x to 6.0
 @cindex Upgrading from 5.x to 6.0
-@UNREVISED
 
   The 6.0 release is aimed to fix several logical inconsistencies that
 affected the previous versions.  The most important one is that until
 version 5.2, the filter script file contained both the actual filter
-script, and the run-time configuration for @command{mailfromd} (in the
+script, and the run-time configuration for @command{mailfromd} (in
 form of @samp{#pragma option} and @samp{#pragma database} statements).
-The new version fixes it and separates run-time configuration from the
+The new version separates run-time configuration from the
 filter script by introducing a special configuration file
 @file{mailfromd.conf} (@pxref{Mailfromd Configuration}).
 
   Consequently, the @samp{#pragma option} and @samp{#pragma database}
-statements are deprecated.  The following deprecated pragmas are
-removed: @samp{#pragma option ehlo}, @samp{#pragma option mailfrom}.
+statements become deprecated.  Furthermore, the following deprecated
+pragmas are removed: @samp{#pragma option ehlo}, @samp{#pragma option mailfrom}.
 These pragmas became deprecated in version 4.0 (@pxref{31x-400}).
 
   The second problem was that the default filter script file had
@@ -57,12 +56,13 @@ was marked as deprecated in version 3.0.
 
   The following features are deprecated: @samp{#pragma option}
 (@pxref{pragma-option} and @samp{#pragma database}
-(@pxref{pragma-database}) directives, legacy style of function
+(@pxref{pragma-database}) directives, the legacy style of function
 declarations (@pxref{old-style function declarations}), calls to
 functions of one argument without parentheses (@pxref{operational
-notation}), @samp{#require} statement and implicit
-concatenation (@pxref{implicit concatenation}.  See
-@ref{Deprecated Features}, for more information about these.
+notation}), the @samp{#require} statement (@xref{import}, for the
+new syntax) and implicit concatenation (@pxref{implicit
+concatenation}).  See @ref{Deprecated Features}, for more information
+about these.
 
   This release also introduces important new features, which are
 summarized in the table below:
@@ -78,11 +78,11 @@ summarized in the table below:
 @end multitable
 
   @command{Mailfromd} version @samp{6.0} will work with unchanged
-scripts from @samp{5.x}.  If the script contains any deprecated
-constructs, @command{mailfromd} will emit warnings for each of them,
-and will create a script for upgrading your script sources.
+scripts from @samp{5.x}.  When started, it will verbosely warn you
+about any deprecated constructs that are used in your filter sources
+and will create a script for upgrading them.
 
-  To upgrade your scripts, follow the steps below:
+  To upgrade your filter scripts, follow the steps below:
 
 @itemize 1
 @item
@@ -123,7 +123,7 @@ $ rm /tmp/mailfromd-newconf.sh
 @end smallexample
 @end itemize
 
-  Notice, that the conversions script attempts to fix only deprecation
+  Notice, that the conversion script attempts to fix only deprecation
 warnings.  It will not try to correct any other type of warnings or
 errors.  For example, you may get warning messages similar to: