1 files changed, 72 insertions, 6 deletions
diff --git a/doc/wydawca.texi b/doc/wydawca.texi
index 1bdea48..1d47cf5 100644
--- a/doc/wydawca.texi
+++ b/doc/wydawca.texi
@@ -31,7 +31,7 @@ Published by the Free Software Foundation,
 51 Franklin Street, Fifth Floor
 Boston, MA 02110-1301, USA
 
-Copyright @copyright{} 2007, 2009-2011 Sergey Poznyakoff
+Copyright @copyright{} 2007, 2009-2012 Sergey Poznyakoff
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -97,6 +97,7 @@ How to Configure @command{wydawca}.
 
 * Syntax::               Configuration file syntax.
 * general::
+* versions::
 * user privileges::
 * daemon::
 * tcp-wrapper::
@@ -196,17 +197,27 @@ handle any number of @samp{source/destination} pairs (called
 notification mechanism, allowing both package maintainers and site
 administrators to be immediately notified about any occurring problems.
 
-  @command{Wydawca} supports version 1.1 of directory file, as
-described in
+  @command{Wydawca} supports upload directive versions 1.1@footnote{
 @ifnothtml
-@ref{FTP Upload Directive File - v1.1,
+@xref{FTP Upload Directive File - v1.1,
 Standalone directives, Standalone directives,
 maintain, Information for maintainers of GNU software}.
 @end ifnothtml
 @ifhtml
-@uref{http://www.gnu.org/prep/maintain/html_node/FTP-Upload-Directive-File-_002d-v1_002e1.html,
+See @uref{http://www.gnu.org/prep/maintain/html_node/FTP-Upload-Directive-File-_002d-v1_002e1.html,
+Standalone directives}.
+@end ifhtml
+} and 1.2@footnote{
+@ifnothtml
+@xref{FTP Upload Directive File - v1.2,
+Standalone directives, Standalone directives,
+maintain, Information for maintainers of GNU software}.
+@end ifnothtml
+@ifhtml
+See @uref{http://www.gnu.org/prep/maintain/html_node/FTP-Upload-Directive-File-_002d-v1_002e2.html,
 Standalone directives}.
 @end ifhtml
+}.
 
   The program is written entirely in @acronym{C}, is highly
 effective and consumes little resources.
@@ -482,6 +493,7 @@ directives any time by running @command{wydawca --config-help}.
 @menu
 * Syntax::               Configuration file syntax.
 * general::
+* versions::
 * user privileges::
 * daemon::
 * tcp-wrapper::
@@ -950,6 +962,60 @@ outgoing messages are looked up in this directory. @xref{statreports,
 gpg-sign}, and @ref{event notification, gpg-sign}.
 @end deffn
 
+@node versions
+@section Upload Directive Versions
+At the time of this writing, FSF has published three versions of the
+upload directives, numbered 1.0 through 1.2. The version 1.0 is
+considered obsolete and was withdrawn in 2006. The only difference
+between versions 1.1 and 1.2 is in handling of files that existed
+prior to upload. The version 1.1 implied automatic archivation of the
+existing files and their replacement with the newly uploaded versions.
+The version 1.2 introduces a new keyword (@samp{replace}) for that
+purpose, which determines its further actions.
+
+For a detailed information about version 1.1, see
+@ifnothtml
+@xref{FTP Upload Directive File - v1.1,
+Standalone directives, Standalone directives,
+maintain, Information for maintainers of GNU software}.
+@end ifnothtml
+@ifhtml
+@uref{http://www.gnu.org/prep/maintain/html_node/FTP-Upload-Directive-File-_002d-v1_002e1.html,
+Standalone directives}.
+@end ifhtml
+
+The version 1.2 and its differences from 1.1 are discussed in
+@ifnothtml
+@xref{FTP Upload Directive File - v1.2,
+Standalone directives, Standalone directives,
+maintain, Information for maintainers of GNU software}.
+@end ifnothtml
+@ifhtml
+@uref{http://www.gnu.org/prep/maintain/html_node/FTP-Upload-Directive-File-_002d-v1_002e2.html,
+Standalone directives}.
+@end ifhtml
+
+By default, @command{wydawca} supports both versions. The supported range of
+versions can be abridged using the following configuration statements:
+
+@deffn {Config} min-version vn
+Sets minimal allowed directive file version. The @var{vn} argument
+must have the form @samp{@var{major}.@var{minor}} and can not be less
+than @samp{1.1}.
+@end deffn
+
+@deffn {Config} max-version vn
+Sets maximal allowed directive file version.
+@end deffn
+
+For example, the following statements configure @command{wydawca} to
+accept only directive files of version 1.2:
+
+@example
+min-version 1.2;
+max-version 1.2;
+@end example
+
 @node user privileges
 @section User Privileges
 
@@ -1748,7 +1814,7 @@ Always make numbered backups.
 @itemx existing
 @kwindex nil@r{, backup method}
 @kwindex existing@r{, backup method}
-Make numbered backups of files that already have them, simple backups.
+Make numbered backups of files that already have them, and simple backups
 of the others.
 
 @item never