Version 4.1

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

4 files changed, 44 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index e049d381..75dc1355 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-11  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* configure.ac, NEWS: Version 4.1
+	* doc/mailfromd.texi: Update
+	* src/pp.c (next_line): Bugfix
+
 2007-06-08  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* doc/mailfromd.texi (NLS Functions): Update
diff --git a/NEWS b/NEWS
index 5d1d23d8..67c1ee05 100644
--- a/NEWS
+++ b/NEWS
@@ -1,15 +1,15 @@
-Mailfromd NEWS -- history of user-visible changes. 2007-05-27
+Mailfromd NEWS -- history of user-visible changes. 2007-06-11
 Copyright (C) 2005, 2006, 2007 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 Please send mailfromd bug reports to <bug-mailfromd@gnu.org.ua>
 
 
-Version 4.0.90
+Version 4.1, 2007-06-11
 
 * National Language Support.
 
-The program include National Language Support.  Polish and Ukrainian
+The program includes National Language Support.  Polish and Ukrainian
 translations are available.
 
 * NLS Functions
diff --git a/configure.ac b/configure.ac
index f3cd2046..edb71b49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,8 +18,8 @@
 
 AC_PREREQ(2.59)
 m4_define([MF_VERSION_MAJOR], 4)
-m4_define([MF_VERSION_MINOR], 0)
-m4_define([MF_VERSION_PATCH], 90)
+m4_define([MF_VERSION_MINOR], 1)
+dnl m4_define([MF_VERSION_PATCH], 0)
 AC_INIT([mailfromd],
         MF_VERSION_MAJOR.MF_VERSION_MINOR[]m4_ifdef([MF_VERSION_PATCH],.MF_VERSION_PATCH),
         [bug-mailfromd@gnu.org.ua])
diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi
index 7f0cbbe2..93011fe8 100644
--- a/doc/mailfromd.texi
+++ b/doc/mailfromd.texi
@@ -7281,25 +7281,28 @@ the decision based on the cached data, or to @samp{0} otherwise.
 
 @node NLS Functions
 @subsubsection National Language Support Functions
-@UNREVISED{}
-
+@cindex @acronym{NLS}
+@cindex National Language Support
   The @dfn{National Language Support} functions allow you to write
 your scripts in such a way, that any textual messages they display are
 automatically translated to your native language, or, more precisely,
 to the language required by your current locale.
 
+@cindex internationalization
+@cindex i18n
+@cindex localization
+@cindex l10n
   This section assumes the reader is familiar with the concepts of program
 @dfn{internationalization} and @dfn{localization}.  If not, please
 refer to @ref{Why, The Purpose of GNU @command{gettext}, The Purpose of GNU
-@command{gettext}, gettext, GNU gettext manual}, before continuing
-reading this section.
+@command{gettext}, gettext, GNU gettext manual}, before reading further.
 
 @flindex nls.mf
   In general, internationalization of any @acronym{MFL} script
 follows the same rules as described in the @cite{GNU gettext manual}.
 First of all, you select the program @dfn{message domain}, i.e. the
 identifier of a set of translatable messages your script contain.
-This identifier is then used to select the appropriate translation.
+This identifier is then used to select appropriate translation.
 The message domain is set using @code{textdomain} function.  For the
 purposes of this section, let's suppose the domain name is
 @samp{myfilter}.  All @acronym{NLS} functions are provided by
@@ -7314,27 +7317,27 @@ where @var{dirname} is the message catalog hierarchy name,
 the message domain.  By default @var{dirname} is
 @file{/usr/local/share/locale}, but you may change it using
 @code{bindtextdomain} function.  The right place for this initial
-@acronym{NLS} setup is in the @samp{begin} block.  To summarize all
-the above, the usual @acronym{NLS} setup will look like:
+@acronym{NLS} setup is in the @samp{begin} block (@pxref{begin/end}).
+To summarize all the above, the usual @acronym{NLS} setup will look like:
 
 @smallexample
 #require nls
 
 begin
 do
-  textdomain ("myfilter")
-  bindtextdomain ("myfilter", "/usr/share/locale");
+  textdomain("myfilter")
+  bindtextdomain("myfilter", "/usr/share/locale");
 done  
 @end smallexample
 
-  For example, given the settings above, and the environment variable
-@env{LC_ALL} set to @samp{pl}, translations will be looked in file
-@file{/usr/share/locale/pl/LC_MESSAGES/myfilter.mo}.  
+  For example, given the settings above, and supposing the environment
+variable @env{LC_ALL} is set to @samp{pl}, translations will be looked
+in file @file{/usr/share/locale/pl/LC_MESSAGES/myfilter.mo}.  
 
   Once this preparatory work is done, you can request each message to
-be translated by using @code{gettext} function, or @code{_()} macro.
-For example, the following statement will produce translated textual
-description for @samp{450} response:
+be translated by using @code{gettext} function, or @code{_}
+(underscore) macro.  For example, the following statement will produce
+translated textual description for @samp{450} response:
 
 @smallexample
 tempfail 450 4.1.0 _("Try again later")
@@ -9390,7 +9393,7 @@ compilation error.
 @node Preprocessor
 @section @acronym{MFL} Preprocessor
 @cindex preprocessor
-@UNREVISED{}
+@cindex m4
   Before compiling the script file, @command{mailfromd} preprocesses
 it.  The built-in preprocessor handles only file inclusion
 (@pxref{include}), while the rest of traditional facililities, such as
@@ -9399,13 +9402,12 @@ external preprocessor.
 
   The detailed description of @command{m4} facilities lies far beyond
 the scope of this document.  You will find a complete user manual in
-@ref{Top, GNU M4 manual, GNU M4, m4, GNU M4 macro processor}.
-
-  The rest of this section assumes the reader is sufficiently
+@ref{Top, GNU M4 manual, GNU M4, m4, GNU M4 macro processor}.  For the 
+rest of this section we assume the reader is sufficiently
 acquainted with @command{m4} macro processor.
 
 @flindex pp-setup
-  The preprocessor is invoked with @option{-s} flag, instructing
+  The external preprocessor is invoked with @option{-s} flag, instructing
 it to include line synchornizattion information in its output, which
 is subsequently used by @acronym{MFL} compiler for purposes of error
 reporting.  The initial set of macro definitions is supplied in file
@@ -9416,10 +9418,10 @@ which is fed to the preprocessor input before the script file itself.
 The default @file{pp-setup} file renames all @command{m4} builtin
 macro names so they all start with the prefix @samp{m4_}@footnote{This
 is similar to GNU m4 @option{--prefix-builtin} options.  This approach
-was chosen to allow for using non-GNU m4's as well.}.  It changes
-comment characters to @samp{/*}, @samp{*/} pair, and leaves the
-default quoting characters, grave (@samp{`}) and acute (@samp{'})
-accents without change.  Finally, @file{pp-setup} defines the
+was chosen to allow for using non-GNU @command{m4} implementations as
+well.}.  It changes comment characters to @samp{/*}, @samp{*/} pair,
+and leaves the default quoting characters, grave (@samp{`}) and acute
+(@samp{'}) accents without change.  Finally, @file{pp-setup} defines the
 following macros:
 
 @anchor{defined}
@@ -9475,9 +9477,9 @@ Functions}).
 
 @deffn {M4 Macro} N_ (@var{msgid})
 A convenience macro, that expands to @var{msgid} verbatim.  It is
-intended to be used as a marker for literal strings that should appear
-in the @file{.po} file, if actual call to @code{gettext} cannot
-be used.  For example:
+intended to mark the literal strings that should appear in the
+@file{.po} file, where actual call to @code{gettext} (@pxref{NLS
+Functions}) cannot be used.  For example:
 
 @smallexample
 /* Mark the variable for translation: cannot use gettext here */
@@ -9734,7 +9736,6 @@ are keywords in @code{on} context:
 
 @node Using MFL Mode, Mailfromd Configuration, MFL, Top
 @chapter Using the GNU Emacs MFL Mode
-@UNREVISED{}
 @cindex Emacs, @acronym{MFL} mode
 @cindex GNU Emacs, @acronym{MFL} mode
 @cindex @acronym{MFL} mode, GNU Emacs
@@ -9742,7 +9743,7 @@ are keywords in @code{on} context:
 edit them with any editor you like.  However, the best choice for this
 job (as well as for many others) is, without doubt, GNU Emacs.  To ease
 the work of editing script files, the @command{mailfromd} package
-provides a special Emacs mode, called @acronym{MFL} mode.
+provides a special Emacs mode, called @dfn{@acronym{MFL} mode}.
 
 @flindex mfl-mode.el
 @flindex site-start.el
@@ -9752,7 +9753,7 @@ provides a special Emacs mode, called @acronym{MFL} mode.
 @cindex MFL mode, 
   The elisp source file providing this mode, @file{mfl-mode.el}, is
 installed automatically, provided that GNU Emacs is present on your
-machine.  To enable the mode, add the following to your Emacs setup
+machine.  To enable the mode, add the following lines to your Emacs setup
 file (either system-wide @file{site-start.el}, or your personal one,
 @file{~/.emacs}):
 
@@ -9765,11 +9766,11 @@ file (either system-wide @file{site-start.el}, or your personal one,
 @end group
 @end smalllisp
 
-  The first line loads the @acronym{MFL} mode, and the second one
+  The first directive loads the @acronym{MFL} mode, and the second one
 tells Emacs to apply it to any file whose name ends in
 @file{/etc/mailfromd.rc}@footnote{This will match most existing
 installations.  In the unlikely case that your @code{$sysconfdir} does
-not end in @file{/etc}, you will have to edit the first line
+not end in @file{/etc}, you will have to edit the directive
 accordingly.} or in a @samp{.mf} suffix. 
 
 @cindex indentation, @acronym{MFL}, default