Improve docs + bugfix.

* doc/Makefile.am (check-options): Fix sed expression.
* doc/wydawca.texi: Update.
* src/job.c (job_start): Don't fork if single_process is set.

1 files changed, 171 insertions, 106 deletions

diff --git a/doc/wydawca.texi b/doc/wydawca.texi
index 82b8403..a136fd6 100644
--- a/doc/wydawca.texi
+++ b/doc/wydawca.texi
@@ -113,10 +113,8 @@ Access Methods
 
 SQL Access Methods
 
-* gpg-key-sql::
 * project-owner-sql::
-* user-data-sql::
-* verify-user-sql::
+* project-uploader-sql::
 
 Mail Notification
 
@@ -372,7 +370,7 @@ reports them on its error output and exits with a non-zero status.
 other inconsistencies and to exit with status 0 if no errors were
 detected, and withs status 1 otherwise. 
 
-@opindex -E, introduced
+@sopindex{E, introduced}
 @xopindex{no-preprocessor, introduced}
   Before parsing, configuration file is preprocessed using
 @command{m4} (@pxref{Preprocessor}). To see the preprocessed
@@ -748,21 +746,48 @@ diagnostic. An initial set of macro definitions is supplied by the
 @file{@var{$prefix}/share/wydawca/@var{version}/include} directory (where
 @var{version} means the version of Wydawca package).
 
-The default @file{pp-setup} file renames all @command{m4} built-in
+  The default @file{pp-setup} file renames all @command{m4} built-in
 macro names so they all start with the prefix @samp{m4_}. This
 is similar to GNU m4 @option{--prefix-builtin} options, but has an
 advantage that it works with non-GNU @command{m4} implementations as
-well.  
+well.
+
+  Additional control over the preprocessor is provided via the
+following command line options:
+
+@table @option
+@xopindex{define, introduced}
+@sopindex{D, introduced}
+@item --define=@var{name}[=@var{value}]
+@itemx -D@var{name}[=@var{value}]
+  Define the preprocessor symbol @var{name} as having @var{value}, or
+empty.
+
+@xopindex{include-directory, introduced}
+@sopindex{I, introduced}
+@item --include-directory=@var{dir}
+@itemx -I@var{dir}
+  Add @var{dir} to the list of directories searched for preprocessor
+include files.
+
+@xopindex{no-preprocessor, defined}
+@item --no-preprocessor
+  Disable preprocessor.
+
+@xopindex{preprocessor, defined}
+@item --preprocessor=@var{command}
+Use @var{command} instead of the default preprocessor.
+@end table
 
 @node syslog
 @section Syslog Configuration Directives
 @cindex syslog, configuration
-@kwindex syslog
 
 Unless told otherwise, @command{wydawca} uses @code{syslog} to print
 its diagnostic messages. By default, the program uses the
 @samp{local1} facility. The @code{syslog} statement allows to change that:
 
+@deffn {Config} syslog @{ ... @}
 @smallexample
 syslog @{
   facility local1;
@@ -770,6 +795,8 @@ syslog @{
   print-priority yes;
 @}
 @end smallexample
+@end deffn
+
 
 @deffn {Config: syslog} facility @var{name}
 @kwindex authpriv@r{, syslog facility}
@@ -816,10 +843,9 @@ databases simultaneously, the only restriction being that they must be
 @command{MySQL} databases (this restriction will be removed in future
 releases).
 
-@kwindex sql
-  A database is defined using @code{sql} block statement. It has the
-following syntax:
+  A database is defined using @code{sql} block statement:
 
+@deffn {Config} sql @var{id} @{ ... @}
 @smallexample
 @group
 sql @var{id} @{
@@ -827,6 +853,7 @@ sql @var{id} @{
   database @var{dbname};
   user @var{username};
   password @var{string};
+  ssl-ca @var{string};
 @}
 @end group
 @end smallexample
@@ -835,6 +862,7 @@ sql @var{id} @{
 database. It is used by another configuration statements (e.g. by
 access methods, see the next section) to refer to this
 database. 
+@end deffn
 
 @deffn {Config: sql} host @var{hostname}[:@var{port-or-socket}]
   Set the hostname or @acronym{IP} address of the host running the
@@ -857,6 +885,11 @@ Sets the database user name.
 Sets the password for accessing the database.
 @end deffn
 
+@deffn {Config: sql} ssl-ca @var{file}
+Sets the pathname to the certificate authority file, if you
+wish to use a secure connection to the server via SSL.
+@end deffn
+
 @noindent
   An example @code{sql} statement follows:
 
@@ -875,14 +908,15 @@ sql default @{
 @section Access Methods
 @cindex Access method
 @cindex @acronym{PGP} key
-@UNREVISED
+
 An @dfn{access method} defines the ways to retrieve user information
-needed to verify the submission. This information can be, for example,
-the user's @acronym{PGP} key or his permissions on a project.
+necessary to verify the submission. This information can be, for
+example, the user's @acronym{PGP} key or his permissions on a project.
 
   Access methods are defined in configuration file using the
 following syntax:
 
+@deffn {Config} access-method
 @smallexample
 access-method @var{method-name} @{
   type @var{type};
@@ -890,6 +924,7 @@ access-method @var{method-name} @{
   params (@var{param1},@var{param2},...);
 @}
 @end smallexample
+@end deffn
 
   Access method statements can appear either in the global scope of
 the configuration file, or inside a @code{spool} statement
@@ -897,15 +932,10 @@ the configuration file, or inside a @code{spool} statement
 pairs in the configuration file, and ones inside a @code{directory}
 statement override them for that particular directory pair.
 
-There are four access methods, identified by the value of
+There are two access methods, identified by the value of
 @var{method-name} tag:
 
 @table @asis
-@kwindex gpg-key
-@item gpg-key
-Retrieve the public @acronym{PGP} key of a user. This method must
-return exactly one string.
-
 @kwindex project-owner
 @item project-owner
   Retrieve email addresses and real names of administrators (or
@@ -913,17 +943,10 @@ return exactly one string.
 consisting of two columns: an email address and a user name, in this
 order.
 
-@kwindex user-data
-@item user-data
-  Return email address and real name of a user. This method must
-return one tuple, consisting of two columns: an email address and a user
-name, in this order.
-
-@kwindex verify-user
-@item verify-user
-  Verify if a user is allowed to make uploads for a certain project. This
-method must return the system name of the user if he is allowed to
-make uploads.
+@kwindex project-uploader
+@item project-uploader
+  Return system user names, real names, emails and GPG keys of
+the users that are allowed to make uploads for the project.
 @end table
 
 The sub-statements of @code{access-method} are:
@@ -956,13 +979,6 @@ subject to meta-variable interpretation (@pxref{meta-interpretation}). The
 following meta-variables are defined:
 
 @table @code
-@kwindex u
-@kwindex user