Resync with DBMail 2.2.5

git-svn-id: https://svn.ic-s.nl/svn/dbmail/trunk/dbmail@2604 7b491191-dbf0-0310-aff6-d879d4d69008

16 files changed, 1376 insertions, 10 deletions

diff --git a/man/dbmail-export.8 b/man/dbmail-export.8
new file mode 100644
index 00000000..b88444e4
--- /dev/null
+++ b/man/dbmail-export.8
@@ -0,0 +1,101 @@
+.\"     Title: dbmail\-export
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.71.0 <http://docbook.sf.net/>
+.\"      Date: 05/14/2007
+.\"    Manual: 
+.\"    Source: 
+.\"
+.TH "DBMAIL\-EXPORT" "8" "05/14/2007" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+dbmail\-export \- export a mailbox from the DBMail mailsystem to mbox format.
+.SH "SYNOPSIS"
+dbmail\-export [\-u user] [\-m mailbox] [\-o outfile] [\-s imap search] [\-d] [\-f configFile].sp
+.SH "DESCRIPTION"
+The dbmail\-export program allows you to export a DBMail mailbox to an mbox formatted mailbox..sp
+.SH "OPTIONS"
+.PP
+\-u user
+.RS 3n
+specify the owner of the mailbox you want to export.
+.RE
+.PP
+\-m mailbox
+.RS 3n
+specify the mailbox you want to export.
+.RE
+.PP
+\-o outfile
+.RS 3n
+specify the file into which the exported mail will be saved.
+.RE
+.PP
+\-s search
+.RS 3n
+use an IMAP SEARCH string to select messages (default: 1:*) for example, to export all messages received in May, use: "1:* SINCE 1\-May\-2007 BEFORE 1\-Jun\-2007"
+.RE
+.PP
+\-d
+.RS 3n
+flag exported messages as \\\\Deleted (use dbmail\-util to expunge)
+.RE
+.SH "COMMON OPTIONS"
+.PP
+\-f configfile
+.RS 3n
+Specify an alternate config file. The utilities are currently hardcoded to use /etc/dbmail.conf for their configs, and will halt if the config file cannot be found. Use the \-f configfile option to specify your system's preferred config file location.
+.RE
+.PP
+\-q
+.RS 3n
+Quietly skip interactive prompts and helpful status messages which would otherwise be printed to stdout. Use two \-q's to silence errors which would otherwise be printed to stderr.
+.RE
+.PP
+\-v
+.RS 3n
+Operate verbosely. Some of the utilities in the DBMail suite can take two \-v's for extra verbosity. Those which don't understand this convention won't complain about having the extra \-v and will simply operate at their normal verbosity.
+.RE
+.PP
+\-V
+.RS 3n
+Show the version and copyright, then exit.
+.RE
+.PP
+\-h
+.RS 3n
+Show a brief summary of options, then exit.
+.RE
+.SH "EXAMPLES"
+To export and delete all messages belonging to user \fIJoe\fR in mailbox \fIInbox\fR more than 30 days old, try this command line:.sp
+.sp
+.RS 3n
+.nf
+dbmail\-export \-u joe \-m inbox \-o textbox5 \-d \-s "1:* BEFORE `date '+%e\-%b\-%Y' \-d '30 days ago'`"
+.fi
+.RE
+Note the careful bash quoting and backticks calling the GNU date(1) command. GNU date(1) has excellent features for retrieving relative dates. If you are using a different shell, you may need different quotes. Descriptions of relative dates are not supported by BSD date(1)..sp
+.SH "BUGS"
+If you experience inexplicable problems with DBMAil, please report the issue to the [1]\&\fIDBMail Bug Tracker\fR..sp
+.SH "LICENSE"
+DBMail and its components are distributed under the terms of the GNU General Public License. Copyrights are held variously by the authors listed below..sp
+.SH "AUTHOR(S)"
+DBMail is a collaborative effort among the core developers listed below and the tremendous help of the testers, patchers and bug hunters listed in the AUTHORS and THANKS files found in the DBMail source distribution..sp
+.sp
+.RS 3n
+.nf
+Eelco van Beek      Aaron Stone            Paul J Stevens
+Roel Rozendaal      Open Source Engineer   NFG Net Facilities Group BV
+Ilja Booij          Palo Alto, CA USA      http://www.nfg.nl
+IC&S                http://hydricacid.com
+Koningsweg 4
+3582 GE Utrecht
+http://www.ic\-s.nl
+.fi
+.RE
+.SH "REFERENCES"
+.TP 3
+1.\ DBMail Bug Tracker
+\%http://dbmail.org/index.php?page=bugs
diff --git a/man/dbmail-export.txt b/man/dbmail-export.txt
index 63a50556..6e04808d 100644
--- a/man/dbmail-export.txt
+++ b/man/dbmail-export.txt
@@ -8,7 +8,7 @@ dbmail-export - export a mailbox from the DBMail mailsystem to mbox format.
 
 SYNOPSIS
 --------
-dbmail-export [-u user] [-m mailbox] [-o outfile] [-f configFile]
+dbmail-export [-u user] [-m mailbox] [-o outfile] [-s imap search] [-d] [-f configFile]
 
 DESCRIPTION
 -----------
@@ -27,7 +27,27 @@ OPTIONS
 -o outfile::
   specify the file into which the exported mail will be saved.
 
+-s search::
+  use an IMAP SEARCH string to select messages (default: 1:\*)
+  for example, to export all messages received in May, use:
+      "1:* SINCE 1-May-2007 BEFORE 1-Jun-2007"
+
+-d::
+  flag exported messages as \\Deleted (use dbmail-util to expunge)
 
 include::commonopts.txt[]
 
+EXAMPLES
+--------
+
+To export and delete all messages belonging to user 'Joe' in mailbox 'Inbox'
+more than 30 days old, try this command line:
+
+    dbmail-export -u joe -m inbox -o textbox5 -d -s "1:* BEFORE `date '+%e-%b-%Y' -d '30 days ago'`"
+
+Note the careful bash quoting and backticks calling the GNU date(1) command.
+GNU date(1) has excellent features for retrieving relative dates. If you are
+using a different shell, you may need different quotes. Descriptions of
+relative dates are not supported by BSD date(1).
+
 include::footer.txt[]
diff --git a/man/dbmail-imapd.8 b/man/dbmail-imapd.8
new file mode 100644
index 00000000..2026ec17
--- /dev/null
+++ b/man/dbmail-imapd.8
@@ -0,0 +1,148 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "DBMAIL-IMAPD" 8 "" "" ""
+.SH NAME
+dbmail-imapd \- provides access to the DBMail system to clients supporting Internet Message Access Protocol, IMAP4r1, as specified in RFC 3501.
+.SH "SYNOPSIS"
+
+
+dbmail\-imapd [\-f configfile] [\-p pidfile] [\-nvVh]
+
+.SH "DESCRIPTION"
+
+
+The dbmail\-imapd daemon is a fully featured IMAP4r1 server\&. It will spawn into a number of default processes as set in the dbmail\&.conf file\&. These processes will enable full IMAP4r1 communication with clients\&.
+
+.SH "OPTIONS"
+
+.TP
+\-p pidfile
+Specify an alternate pid file\&. The daemons are currently hardcoded to use /var/run/dbmail\-<daemon> for their pid files, and will halt if the pid file cannot be written\&. Use the \-p pidfile option to place the pid file in your system's preferred location\&.
+
+.TP
+\-n
+No daemonize\&. The program remains attached to the console from which it was started\&. This is quite useful for debugging when combined with the \-v option\&.
+
+.SH "COMMON OPTIONS"
+
+.TP
+\-f configfile
+Specify an alternate config file\&. The utilities are currently hardcoded to use /etc/dbmail\&.conf for their configs, and will halt if the config file cannot be found\&. Use the \-f configfile option to specify your system's preferred config file location\&.
+
+.TP
+\-q
+Quietly skip interactive prompts and helpful status messages which would otherwise be printed to stdout\&. Use two \-q's to silence errors which would otherwise be printed to stderr\&.
+
+.TP
+\-v
+Operate verbosely\&. Some of the utilities in the DBMail suite can take two \-v's for extra verbosity\&. Those which don't understand this convention won't complain about having the extra \-v and will simply operate at their normal verbosity\&.
+
+.TP
+\-V
+Show the version and copyright, then exit\&.
+
+.TP
+\-h
+Show a brief summary of options, then exit\&.
+
+.SH "EXAMPLE"
+
+.TP
+For xinetd:
+
+
+.IP
+  # /etc/xinet\&.d/dbmail\-imap
+  #
+  service imap
+  {
+          socket_type     = stream
+          wait            = no
+          user            = root
+          server          = /usr/local/sbin/dbmail\-imapd
+          protocol        = tcp
+          server_args     = \-n
+          log_on_failure  += USERID
+          disable         = no
+  }
+.TP
+For stunnel:
+
+
+.IP
+  pid = /var/run/stunnel\&.pid
+  cert = /etc/stunnel/yourkeys\&.pem
+
+  # The next two sections will turn stunnel
+  # into a 'secure inetd'\&. This is mutually
+  # exclusive with the proxy sections below\&.
+  [dbmail\-pop3d]
+  accept = 995
+  exec = /usr/local/sbin/dbmail\-pop3d
+  execargs = dbmail\-pop3d \-n
+
+  [dbmail\-imapd]
+  accept = 993
+  exec = /usr/local/sbin/dbmail\-imapd
+  execargs = dbmail\-imapd \-n
+
+  # The next two sections will proxy
+  # from the secure protocol over to
+  # the insecure protocol\&. In this case,
+  # use BINDIP=localhost in dbmail\&.conf!
+  [pop3s]
+  accept  = 995
+  connect = 110
+
+  [imaps]
+  accept  = 993
+  connect = 143
+
+  # Useful if your preferred SMTP server doesn't do SSL/TLS\&.
+  # This is with your MTA configuration, not DBMAil, per se\&.
+  [ssmtp]
+  accept  = 465
+  connect = 25
+
+.SH "BUGS"
+
+
+If you experience inexplicable problems with DBMAil, please report the issue to the DBMail Bug Tracker: \fIhttp://dbmail.org/index.php?page=bugs\fR\&.
+
+.SH "LICENSE"
+
+
+DBMail and its components are distributed under the terms of the GNU General Public License\&. Copyrights are held variously by the authors listed below\&.
+
+.SH "AUTHOR(S)"
+
+
+DBMail is a collaborative effort among the core developers listed below and the tremendous help of the testers, patchers and bug hunters listed in the AUTHORS and THANKS files found in the DBMail source distribution\&.
+
+.nf
+Eelco van Beek      Aaron Stone            Paul J Stevens
+Roel Rozendaal      Programmer             NFG Net Facilities Group BV
+Ilja Booij          Palo Alto, CA USA      http://www\&.nfg\&.nl
+IC&S                http://hydricacid\&.com
+Koningsweg 4
+3582 GE Utrecht
+http://www\&.ic\-s\&.nl
+.fi
+
diff --git a/man/dbmail-lmtpd.8 b/man/dbmail-lmtpd.8
new file mode 100644
index 00000000..feb29122
--- /dev/null
+++ b/man/dbmail-lmtpd.8
@@ -0,0 +1,89 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "DBMAIL-LMTPD" 8 "" "" ""
+.SH NAME
+dbmail-lmtpd \- receive messages from an MTA supporting the Lightweight Mail Transport Protocol, as specified in RFC 2033.
+.SH "SYNOPSIS"
+
+
+dbmail\-lmtpd [\-f configfile] [\-p pidfile] [\-nvVh]
+
+.SH "DESCRIPTION"
+
+
+The dbmail\-lmtpd daemon will spawn child processes as specified in the dbmail\&.conf file\&. These processes listen, by default, on port 24 of the localhost interface\&. Mail Transfer Agents, MTA's such as Postfix and Exim, speak LMTP to their Mail Delivery Agents which receive and store messages\&. DBMail implements such a system using a database backend\&.
+
+.SH "OPTIONS"
+
+.TP
+\-p pidfile
+Specify an alternate pid file\&. The daemons are currently hardcoded to use /var/run/dbmail\-<daemon> for their pid files, and will halt if the pid file cannot be written\&. Use the \-p pidfile option to place the pid file in your system's preferred location\&.
+
+.TP
+\-n
+No daemonize\&. The program remains attached to the console from which it was started\&. This is quite useful for debugging when combined with the \-v option\&.
+
+.SH "COMMON OPTIONS"
+
+.TP
+\-f configfile
+Specify an alternate config file\&. The utilities are currently hardcoded to use /etc/dbmail\&.conf for their configs, and will halt if the config file cannot be found\&. Use the \-f configfile option to specify your system's preferred config file location\&.
+
+.TP
+\-q
+Quietly skip interactive prompts and helpful status messages which would otherwise be printed to stdout\&. Use two \-q's to silence errors which would otherwise be printed to stderr\&.
+
+.TP
+\-v
+Operate verbosely\&. Some of the utilities in the DBMail suite can take two \-v's for extra verbosity\&. Those which don't understand this convention won't complain about having the extra \-v and will simply operate at their normal verbosity\&.
+
+.TP
+\-V
+Show the version and copyright, then exit\&.
+
+.TP
+\-h
+Show a brief summary of options, then exit\&.
+
+.SH "BUGS"
+
+
+If you experience inexplicable problems with DBMAil, please report the issue to the DBMail Bug Tracker: \fIhttp://dbmail.org/index.php?page=bugs\fR\&.
+
+.SH "LICENSE"
+
+
+DBMail and its components are distributed under the terms of the GNU General Public License\&. Copyrights are held variously by the authors listed below\&.
+
+.SH "AUTHOR(S)"
+
+
+DBMail is a collaborative effort among the core developers listed below and the tremendous help of the testers, patchers and bug hunters listed in the AUTHORS and THANKS files found in the DBMail source distribution\&.
+
+.nf
+Eelco van Beek      Aaron Stone            Paul J Stevens
+Roel Rozendaal      Programmer             NFG Net Facilities Group BV
+Ilja Booij          Palo Alto, CA USA      http://www\&.nfg\&.nl
+IC&S                http://hydricacid\&.com
+Koningsweg 4
+3582 GE Utrecht
+http://www\&.ic\-s\&.nl
+.fi
+
diff --git a/man/dbmail-pop3d.8 b/man/dbmail-pop3d.8
new file mode 100644
index 00000000..4b03d6ed
--- /dev/null
+++ b/man/dbmail-pop3d.8
@@ -0,0 +1,89 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "DBMAIL-POP3D" 8 "" "" ""
+.SH NAME
+dbmail-pop3d \- provides access to the DBMail system to client support- ing Post Office Protocol, POP3, as specified in RFC 1939.
+.SH "SYNOPSIS"
+
+
+dbmail\-pop3d [\-f configfile] [\-p pidfile] [\-nvVh]
+
+.SH "DESCRIPTION"
+
+
+The dbmail\-pop3d daemon is a fully featured POP3 server\&. It will spawn into a number of default processes as set in the dbmail\&.conf file\&. These processes will enable full POP3 communication with clients\&.
+
+.SH "OPTIONS"
+
+.TP
+\-p pidfile
+Specify an alternate pid file\&. The daemons are currently hardcoded to use /var/run/dbmail\-<daemon> for their pid files, and will halt if the pid file cannot be written\&. Use the \-p pidfile option to place the pid file in your system's preferred location\&.
+
+.TP
+\-n
+No daemonize\&. The program remains attached to the console from which it was started\&. This is quite useful for debugging when combined with the \-v option\&.
+
+.SH "COMMON OPTIONS"
+
+.TP
+\-f configfile
+Specify an alternate config file\&. The utilities are currently hardcoded to use /etc/dbmail\&.conf for their configs, and will halt if the config file cannot be found\&. Use the \-f configfile option to specify your system's preferred config file location\&.
+
+.TP
+\-q
+Quietly skip interactive prompts and helpful status messages which would otherwise be printed to stdout\&. Use two \-q's to silence errors which would otherwise be printed to stderr\&.
+
+.TP
+\-v
+Operate verbosely\&. Some of the utilities in the DBMail suite can take two \-v's for extra verbosity\&. Those which don't understand this convention won't complain about having the extra \-v and will simply operate at their normal verbosity\&.
+
+.TP
+\-V
+Show the version and copyright, then exit\&.
+
+.TP
+\-h
+Show a brief summary of options, then exit\&.
+
+.SH "BUGS"
+
+
+If you experience inexplicable problems with DBMAil, please report the issue to the DBMail Bug Tracker: \fIhttp://dbmail.org/index.php?page=bugs\fR\&.
+
+.SH "LICENSE"
+
+
+DBMail and its components are distributed under the terms of the GNU General Public License\&. Copyrights are held variously by the authors listed below\&.
+
+.SH "AUTHOR(S)"
+
+
+DBMail is a collaborative effort among the core developers listed below and the tremendous help of the testers, patchers and bug hunters listed in the AUTHORS and THANKS files found in the DBMail source distribution\&.
+
+.nf
+Eelco van Beek      Aaron Stone            Paul J Stevens
+Roel Rozendaal      Programmer             NFG Net Facilities Group BV
+Ilja Booij          Palo Alto, CA USA      http://www\&.nfg\&.nl
+IC&S                http://hydricacid\&.com
+Koningsweg 4
+3582 GE Utrecht
+http://www\&.ic\-s\&.nl
+.fi
+
diff --git a/man/dbmail-sievecmd.8 b/man/dbmail-sievecmd.8
new file mode 100644
index 00000000..9b987b0e
--- /dev/null
+++ b/man/dbmail-sievecmd.8
@@ -0,0 +1,109 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "DBMAIL-SIEVECMD" 8 "" "" ""
+.SH NAME
+dbmail-sievecmd \- manipulates Sieve scripts in the DBMail database.
+.SH "SYNOPSIS"
+
+
+dbmail\-sievecmd \-u username [\-l] [\-a scriptname] [\-d scriptname] [\-i scriptname file] [\-c [scriptname]] [\-r scriptname] [\-f configfile] [\-nvVh]
+
+.SH "DESCRIPTION"
+
+
+DBMail stores Sieve scripts in a table in the DBMail database\&. These scripts are used to sort incoming mail for the email users\&. Each user has their own script space and may upload scripts to the dbmail\-timsieved(8) daemon\&. The dbmail\-sievecmd(8) utility provides a convenient method for the system administrator to work with Sieve scripts from the command line\&.
+
+.SH "OPTIONS"
+
+.TP
+\-u username
+Specify the user whose scripts we will be modifying\&.
+
+.TP
+\-l
+List scripts belonging to user
+
+.TP
+\-a scriptname
+Activates scriptname, deactivating all other scripts\&.
+
+.TP
+\-d scriptname
+Deactivates scriptname if it was active\&.
+
+.TP
+\-i scriptname file
+Creates a script called scriptname by importing file\&. If file is \- (dash) or unspecified, \fIstdin\fR will be read\&.
+
+.TP
+\-c [scriptname]
+Print out the named script\&. If no script is given, the active script is printed\&.
+
+.TP
+\-r scriptname
+Remove the named script\&. If the script was active, no script will be active after it is deletion\&.
+
+.SH "COMMON OPTIONS"
+
+.TP
+\-f configfile
+Specify an alternate config file\&. The utilities are currently hardcoded to use /etc/dbmail\&.conf for their configs, and will halt if the config file cannot be found\&. Use the \-f configfile option to specify your system's preferred config file location\&.
+
+.TP
+\-q
+Quietly skip interactive prompts and helpful status messages which would otherwise be printed to stdout\&. Use two \-q's to silence errors which would otherwise be printed to stderr\&.
+
+.TP
+\-v
+Operate verbosely\&. Some of the utilities in the DBMail suite can take two \-v's for extra verbosity\&. Those which don't understand this convention won't complain about having the extra \-v and will simply operate at their normal verbosity\&.
+
+.TP
+\-V
+Show the version and copyright, then exit\&.
+
+.TP
+\-h
+Show a brief summary of options, then exit\&.
+
+.SH "BUGS"
+
+
+If you experience inexplicable problems with DBMAil, please report the issue to the DBMail Bug Tracker: \fIhttp://dbmail.org/index.php?page=bugs\fR\&.
+
+.SH "LICENSE"
+
+
+DBMail and its components are distributed under the terms of the GNU General Public License\&. Copyrights are held variously by the authors listed below\&.
+
+.SH "AUTHOR(S)"
+
+
+DBMail is a collaborative effort among the core developers listed below and the tremendous help of the testers, patchers and bug hunters listed in the AUTHORS and THANKS files found in the DBMail source distribution\&.
+
+.nf
+Eelco van Beek      Aaron Stone            Paul J Stevens
+Roel Rozendaal      Programmer             NFG Net Facilities Group BV
+Ilja Booij          Palo Alto, CA USA      http://www\&.nfg\&.nl
+IC&S                http://hydricacid\&.com
+Koningsweg 4
+3582 GE Utrecht
+http://www\&.ic\-s\&.nl
+.fi
+
diff --git a/man/dbmail-smtp.1 b/man/dbmail-smtp.1
new file mode 100644
index 00000000..f19730eb
--- /dev/null
+++ b/man/dbmail-smtp.1
@@ -0,0 +1,105 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "DBMAIL-SMTP" 1 "" "" ""
+.SH NAME
+dbmail-smtp \- inserts messages into the DBMail mailsystem.
+.SH "SYNOPSIS"
+
+
+dbmail\-smtp [\-t headerfield] [\-d addresses] [\-u usernames] [\-m|\-M mailboxname] [\-r return path] [\-f configFile]
+
+.SH "DESCRIPTION"
+
+
+The dbmail\-smtp program inserts messages from the commandline or from any MTA into the DBMail mailsystem\&. The program reads from standard input\&.
+
+.SH "OPTIONS"
+
+.TP
+\-t headerfield
+Deliver messages to the recipient MIME header specified in headerfield\&. The default header to use is the "Delivered\-To:" header\&.
+
+.TP
+\-d addresses...
+Deliver messages to the recipients specified by addresses\&. This option is mostly used for delivery from an MTA\&. Seperate multiple addresses by spaces\&.
+
+.TP
+\-u usernames...
+Deliver messages straight to the given username\&. Seperate multiple usernames with spaces\&.
+
+.TP
+\-m mailboxname
+Deliver messages to mailbox mailboxname of the recipient\&. If this mailbox does not exist yet, it is created\&. Sieve scripts will be run normally, possibly altering the destination mailbox\&.
+
+.TP
+\-M mailboxname
+Deliver messages to mailbox mailboxname of the recipient\&. If this mailbox does not exist yet, it is created\&. Sieve scripts are not run\&. Permission checks are not performed for mailbox creation or message delivery\&.
+
+.TP
+\-r returnpath
+Set return path for bounces and other error reports to return path\&.
+
+.SH "COMMON OPTIONS"
+
+.TP
+\-f configfile
+Specify an alternate config file\&. The utilities are currently hardcoded to use /etc/dbmail\&.conf for their configs, and will halt if the config file cannot be found\&. Use the \-f configfile option to specify your system's preferred config file location\&.
+
+.TP
+\-q
+Quietly skip interactive prompts and helpful status messages which would otherwise be printed to stdout\&. Use two \-q's to silence errors which would otherwise be printed to stderr\&.
+
+.TP
+\-v
+Operate verbosely\&. Some of the utilities in the DBMail suite can take two \-v's for extra verbosity\&. Those which don't understand this convention won't complain about having the extra \-v and will simply operate at their normal verbosity\&.
+
+.TP
+\-V
+Show the version and copyright, then exit\&.
+
+.TP
+\-h
+Show a brief summary of options, then exit\&.
+
+.SH "BUGS"
+
+
+If you experience inexplicable problems with DBMAil, please report the issue to the DBMail Bug Tracker: \fIhttp://dbmail.org/index.php?page=bugs\fR\&.
+
+.SH "LICENSE"
+
+
+DBMail and its components are distributed under the terms of the GNU General Public License\&. Copyrights are held variously by the authors listed below\&.
+
+.SH "AUTHOR(S)"
+
+
+DBMail is a collaborative effort among the core developers listed below and the tremendous help of the testers, patchers and bug hunters listed in the AUTHORS and THANKS files found in the DBMail source distribution\&.
+
+.nf
+Eelco van Beek      Aaron Stone            Paul J Stevens
+Roel Rozendaal      Programmer             NFG Net Facilities Group BV
+Ilja Booij          Palo Alto, CA USA      http://www\&.nfg\&.nl
+IC&S                http://hydricacid\&.com
+Koningsweg 4
+3582 GE Utrecht
+http://www\&.ic\-s\&.nl
+.fi
+
diff --git a/man/dbmail-timsieved.8 b/man/dbmail-timsieved.8
new file mode 100644
index 00000000..cf412e4a
--- /dev/null
+++ b/man/dbmail-timsieved.8
@@ -0,0 +1,89 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "DBMAIL-TIMSIEVED" 8 "" "" ""
+.SH NAME
+dbmail-timsieved \- speaks the Manage Sieve draft protocol, used for managing Sieve scripts for a user's email account.
+.SH "SYNOPSIS"
+
+
+dbmail\-timsieved [\-f configfile] [\-p pidfile] [\-nvVh]
+
+.SH "DESCRIPTION"
+
+
+The dbmail\-timsieved daemon will spawn child processes as specified in the dbmail\&.conf file\&. These processes listen, by default, on port 2000 of the localhost interface\&.
+
+.SH "OPTIONS"
+
+.TP
+\-p pidfile
+Specify an alternate pid file\&. The daemons are currently hardcoded to use /var/run/dbmail\-<daemon> for their pid files, and will halt if the pid file cannot be written\&. Use the \-p pidfile option to place the pid file in your system's preferred location\&.
+
+.TP
+\-n
+No daemonize\&. The program remains attached to the console from which it was started\&. This is quite useful for debugging when combined with the \-v option\&.
+
+.SH "COMMON OPTIONS"
+
+.TP
+\-f configfile
+Specify an alternate config file\&. The utilities are currently hardcoded to use /etc/dbmail\&.conf for their configs, and will halt if the config file cannot be found\&. Use the \-f configfile option to specify your system's preferred config file location\&.
+
+.TP
+\-q
+Quietly skip interactive prompts and helpful status messages which would otherwise be printed to stdout\&. Use two \-q's to silence errors which would otherwise be printed to stderr\&.
+
+.TP
+\-v
+Operate verbosely\&. Some of the utilities in the DBMail suite can take two \-v's for extra verbosity\&. Those which don't understand this convention won't complain about having the extra \-v and will simply operate at their normal verbosity\&.
+
+.TP
+\-V
+Show the version and copyright, then exit\&.
+
+.TP
+\-h
+Show a brief summary of options, then exit\&.
+
+.SH "BUGS"
+
+
+If you experience inexplicable problems with DBMAil, please report the issue to the DBMail Bug Tracker: \fIhttp://dbmail.org/index.php?page=bugs\fR\&.
+
+.SH "LICENSE"
+
+
+DBMail and its components are distributed under the terms of the GNU General Public License\&. Copyrights are held variously by the authors listed below\&.
+
+.SH "AUTHOR(S)"
+
+
+DBMail is a collaborative effort among the core developers listed below and the tremendous help of the testers, patchers and bug hunters listed in the AUTHORS and THANKS files found in the DBMail source distribution\&.
+
+.nf
+Eelco van Beek      Aaron Stone            Paul J Stevens
+Roel Rozendaal      Programmer             NFG Net Facilities Group BV
+Ilja Booij          Palo Alto, CA USA      http://www\&.nfg\&.nl
+IC&S                http://hydricacid\&.com
+Koningsweg 4
+3582 GE Utrecht
+http://www\&.ic\-s\&.nl
+.fi
+
diff --git a/man/dbmail-users.8 b/man/dbmail-users.8
new file mode 100644
index 00000000..1694c650
--- /dev/null
+++ b/man/dbmail-users.8
@@ -0,0 +1,210 @@
+.\"     Title: dbmail\-users
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.71.0 <http://docbook.sf.net/>
+.\"      Date: 04/27/2007
+.\"    Manual: 
+.\"    Source: 
+.\"
+.TH "DBMAIL\-USERS" "8" "04/27/2007" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+dbmail\-users \- manages the DBMail user database.
+.SH "SYNOPSIS"
+dbmail\-users { \-a username | \-c username } [ \-g clientid ] [ \-m maxmail] [ \-p passwordtype ] [ \-P shadowfile ] [ \-w password ] [ \-W passwordfile] [ \-u username ] [ \-s aliases ] [ \-S aliases ].sp
+dbmail\-users { \-d username | \-e username }.sp
+dbmail\-users \-l userspec.sp
+dbmail\-users \-x alias [ \-t forwards ] [ \-T forwards ].sp
+.SH "DESCRIPTION"
+The dbmail\-users program enables you to manage the DBMail users. It lets you add, delete and change users as well as show information about a specific user or display a list of existing users. It also has the capability of adding/removing separate aliases..sp
+.SH "MODE OPTIONS"
+.PP
+\-a user
+.RS 3n
+Add a user
+.RE
+.PP
+\-d user
+.RS 3n
+Delete a user
+.RE
+.PP
+\-c user
+.RS 3n
+Change details for a user
+.RE
+.PP
+\-e user
+.RS 3n
+Empty all mailboxes for a user
+.RE
+.PP
+\-l uspec
+.RS 3n
+List information for matching users
+.RE
+.PP
+\-x alias
+.RS 3n
+Create an external forwarding address
+.RE
+.SH "MINOR OPTIONS"
+.PP
+\-w passwd
+.RS 3n
+Specify user's password on the command line
+.RE
+.PP
+\-W [file]
+.RS 3n
+Read from a file or prompt for a user's password
+.RE
+.PP
+\-p pwtype
+.RS 3n
+Password type may be one of the following: plaintext, crypt, md5\-hash, md5\-digest, crypt\-raw, md5\-hash\-raw, md5\-digest\-raw, md5\-base64, md5\-base64\-raw.
+.RE
+.PP
+\-P [file]
+.RS 3n
+Pull encrypted password from the shadow file
+.RE
+.PP
+\-u user
+.RS 3n
+New username (only useful for \-c, change)
+.RE
+.PP
+\-g cid
+.RS 3n
+Assign the user to a client group.
+.RE
+.PP
+\-m max
+.RS 3n
+Set the maximum mail quota in <bytes>B, <kbytes>K, or <mbytes>M, default in bytes If set to 0, there will be no limit.
+.RE
+.PP
+\-s alias[,alias\&...]
+.RS 3n
+Adds a list of recipient aliases. An alias is an e\-mail address that is being delivered to the DBMail mailsystem and should be delivered to this user.
+.RE
+.PP
+\-S alias[,alias\&...]
+.RS 3n
+Removes a list of recipient aliases. Use wildcards ? and * to match any single character and any number of characters, respectively.
+.RE
+.PP
+\-t forward[,forward\&...]
+.RS 3n
+Adds a list of deliver\-to forwards.
+.RE
+.PP
+\-T forward[,forward\&...]
+.RS 3n
+Removes a list of deliver\-to forwards. Use wildcards ? and * to match any single character and any number of characters, respectively.
+.RE
+.SH "COMMON OPTIONS"
+.PP
+\-f configfile
+.RS 3n
+Specify an alternate config file. The utilities are currently hardcoded to use /etc/dbmail.conf for their configs, and will halt if the config file cannot be found. Use the \-f configfile option to specify your system's preferred config file location.
+.RE
+.PP
+\-q
+.RS 3n
+Quietly skip interactive prompts and helpful status messages which would otherwise be printed to stdout. Use two \-q's to silence errors which would otherwise be printed to stderr.
+.RE
+.PP
+\-v
+.RS 3n
+Operate verbosely. Some of the utilities in the DBMail suite can take two \-v's for extra verbosity. Those which don't understand this convention won't complain about having the extra \-v and will simply operate at their normal verbosity.
+.RE
+.PP
+\-V
+.RS 3n
+Show the version and copyright, then exit.
+.RE
+.PP
+\-h
+.RS 3n
+Show a brief summary of options, then exit.
+.RE
+.SH "ALIASES VS. FORWARDS"
+One question we often see on the dbmail@dbmail.org mailing list is what the difference is between aliases and forwards. When using dbmail\-users, the different command line options are there because an alias attaches some arbitrary address to a particular user's account, while a forward attaches some arbitrary address another arbitrary address or pipe out..sp
+When using dbmail\-users with major option \-c, you must use minor option \-s/\-S for modifying aliases. When using dbmail\-users with major option \-x, you must use \-t/\-T for modifying forwards..sp
+.SH "ALIASES"
+When creating a new user account, you must either add an initial alias that delivers to the account name, or make the account in the form of a fully qualified email address. For example, the user named \fIBaz\fR created like this:.sp
+dbmail\-users \-a baz \-p crypt \-w psword.sp
+will \fBnot\fR actually receive any mail yet! You must be sure to add an alias:.sp
+dbmail\-users \-c baz \-s baz@foodomain.sp
+You may add multiple aliases by repeatedly calling the dbmail\-users(8) utility, or by calling it with a comma\-separated list of aliases:.sp
+dbmail\-users \-c baz \-s baz@foodomain,baz@bardomain.sp
+Three catch\-all modes are also supported, for domains, sub\-domains, and local parts:.sp
+dbmail\-users \-a baz \-s @bazdomain.sp
+dbmail\-users \-a baz \-s @.allsubs.bazdomain.sp
+dbmail\-users \-a baz \-s baz@.sp
+The first example catches email addressed to any user @bazdomain and delivers it to Baz's INBOX. The second example catch email address to any user at any subdomain below .allsubs.bazdomain (\fBnot\fR including allsubs.bazdomain itself!) The third example catches email addressed to baz@ at any domain..sp
+There is no support for delivering to a particular mailbox other than INBOX via the aliases system. Please use a Sieve script to sort mail like this..sp
+.SH "FORWARDS"
+Incoming messages addressed to particular email addresses can be forwarded out to outside email addresses, piped out to a command (when prepended with | \fIpipe\fR) or piped out with an mbox\-style From line to a command (when prepended with ! \fIbang\fR). For example:.sp
+.sp
+.RS 3n
+.nf
+dbmail\-users \-x bar@domain \-t bar@another.domain
+.fi
+.RE
+.sp
+.RS 3n
+.nf
+dbmail\-users \-x bar@domain \-t "|/usr/sbin/superspamtrapper"
+.fi
+.RE
+.sp
+.RS 3n
+.nf
+dbmail\-users \-x bar@domain \-t "!cat > /var/spool/mail/bar/whatever.mbox"
+.fi
+.RE
+Forwards can be listed using the same \-l command as for users. For example, to see where the local address bar@domain might be forwarded to, use this:.sp
+.sp
+.RS 3n
+.nf
+dbmail\-users \-l bar@domain
+  forward [bar@domain] to [bar@another.domain]
+  forward [bar@domain] to [|/usr/sbin/superspamtrapper]
+  forward [bar@domain] to [!cat > /var/spool/mail/bar/whatever.mbox]
+.fi
+.RE
+Forwards can be removed using basic glob style pattern matching. A ? \fIquestion\fR means "match zero or one of any character" and * \fIasterisk\fR means "match zero or more of any character." For example:.sp
+.sp
+.RS 3n
+.nf
+dbmail\-users \-x bar@domain \-T "*"
+.fi
+.RE
+will complete and totally remove the \fIbar@domain\fR external alias and all of its forwarding addresses and commands..sp
+.SH "BUGS"
+If you experience inexplicable problems with DBMAil, please report the issue to the [1]\&\fIDBMail Bug Tracker\fR..sp
+.SH "LICENSE"
+DBMail and its components are distributed under the terms of the GNU General Public License. Copyrights are held variously by the authors listed below..sp
+.SH "AUTHOR(S)"
+DBMail is a collaborative effort among the core developers listed below and the tremendous help of the testers, patchers and bug hunters listed in the AUTHORS and THANKS files found in the DBMail source distribution..sp
+.sp
+.RS 3n
+.nf
+Eelco van Beek      Aaron Stone            Paul J Stevens
+Roel Rozendaal      Programmer             NFG Net Facilities Group BV
+Ilja Booij          Palo Alto, CA USA      http://www.nfg.nl
+IC&S                http://hydricacid.com
+Koningsweg 4
+3582 GE Utrecht
+http://www.ic\-s.nl
+.fi
+.RE
+.SH "REFERENCES"
+.TP 3
+1.\ DBMail Bug Tracker
+\%http://dbmail.org/index.php?page=bugs
diff --git a/man/dbmail-users.txt b/man/dbmail-users.txt
index eafd3b34..28501d03 100644
--- a/man/dbmail-users.txt
+++ b/man/dbmail-users.txt
@@ -93,6 +93,20 @@ MINOR OPTIONS
 
 include::commonopts.txt[]
 
+ALIASES VS. FORWARDS
+--------------------
+
+One question we often see on the dbmail@dbmail.org mailing list is what the
+difference is between aliases and forwards.
+When using dbmail-users, the different command line options are there
+because an alias attaches some arbitrary address to a particular user's
+account, while a forward attaches some arbitrary address another
+arbitrary address or pipe out.
+
+When using dbmail-users with major option -c, you must use minor option -s/-S
+for modifying aliases. When using dbmail-users with major option -x, you must
+use -t/-T for modifying forwards.
+
 ALIASES
 -------
 
@@ -112,15 +126,18 @@ utility, or by calling it with a comma-separated list of aliases:
 
 `    dbmail-users -c baz -s baz@foodomain,baz@bardomain`
 
-Two catch-all modes are also supported, for domains and for local parts:
+Three catch-all modes are also supported, for domains, sub-domains, and local parts:
 
 `    dbmail-users -a baz -s @bazdomain`
+
+`    dbmail-users -a baz -s @.allsubs.bazdomain`
  
 `    dbmail-users -a baz -s baz@`
 
 The first example catches email addressed to any user @bazdomain and delivers it
-to Baz's INBOX. The second example catches email addressed to baz@ any domain
-and also delivers it to Baz's INBOX.
+to Baz's INBOX. The second example catch email address to any user at any
+subdomain below .allsubs.bazdomain (*not* including allsubs.bazdomain
+itself!) The third example catches email addressed to baz@ at any domain.
 
 There is no support for delivering to a particular mailbox other than INBOX
 via the aliases system. Please use a Sieve script to sort mail like this.
@@ -160,4 +177,5 @@ its forwarding addresses and commands.
 
 
 
+
 include::footer.txt[]
diff --git a/man/dbmail-util.8 b/man/dbmail-util.8
new file mode 100644
index 00000000..86616ff9
--- /dev/null
+++ b/man/dbmail-util.8
@@ -0,0 +1,138 @@
+.\"     Title: dbmail\-util
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.71.0 <http://docbook.sf.net/>
+.\"      Date: 05/14/2007
+.\"    Manual: 
+.\"    Source: 
+.\"
+.TH "DBMAIL\-UTIL" "8" "05/14/2007" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+dbmail\-util \- maintains the integrity and cleanliness of the DBMail datatables.
+.SH "SYNOPSIS"
+dbmail\-util [\-actubpd] [\-l time] [\-yn] [\-qvVh] [\-f configFile].sp
+.SH "DESCRIPTION"
+The dbmail\-util program does a global database cleanup and integrity check. All messages that are set for deletion will be marked for final deletion (status 3). All message that are marked for final deletion will be cleared from the database. The integrity check will check for unconnected messageblocks, unconnected messages and unconnected mailboxes..sp
+By default, the checks run in a read\-only mode, possibly prompting to make changes. Pass the \-n option to respond no to any prompts. Pass the \-y option to make read\-write changes, responding yes to any prompts..sp
+As DBMail matures and new features are added, additional check modes will be added. In addition, more prompts may be added for different situations where changes need to be committed to the database. We recommend using the \-a option to run all checks and using the \-n and \-y options if you expect no prompts..sp
+.SH "OPTIONS"
+.PP
+\-a
+.RS 3n
+Perform all checks listed below. This option will be kept up\-to\-date with additional checks available in future versions.
+.RE
+.PP
+\-c
+.RS 3n
+Clean up unlinked message entries.
+.RE
+.PP
+\-t
+.RS 3n
+Test for message integrity.
+.RE
+.PP
+\-u
+.RS 3n
+Null message check.
+.RE
+.PP
+\-b
+.RS 3n
+Check and rebuild the body/header/envelope cache tables.
+.RE
+.PP
+\-d
+.RS 3n
+Set DELETE status for messages flagged \\Deleted by IMAP or POP3.
+.RE
+.PP
+\-p
+.RS 3n
+Purge messages with DELETE status. To purge messages currently marked \\Deleted, run with the \-pd options twice. This is not recommended; it is better to leave a grace period for old messages before permanently wiping them from the database.
+.RE
+.PP
+\-r time
+.RS 3n
+Clear the reply cache used for autoreplies and Sieve vacations. The time is specified as <hours>h<minutes>m (don't include the angle brackets, though!).
+.RE
+.PP
+\-l time
+.RS 3n
+Clear the IP log used for IMAP/POP\-before\-SMTP. The time is specified as <hours>h<minutes>m (don't include the angle brackets, though!).
+.RE
+.PP
+\-n
+.RS 3n
+Show the intended repairs without making any changes, i.e. no to all.
+.RE
+.PP
+\-y
+.RS 3n
+Perform all repair actions , i.e. yes to all.
+.RE
+.PP
+\-i
+.RS 3n
+Enter an interactive user management console in some future version where this feature is implemented. It is not currently available.
+.RE
+.SH "COMMON OPTIONS"
+.PP
+\-f configfile
+.RS 3n
+Specify an alternate config file. The utilities are currently hardcoded to use /etc/dbmail.conf for their configs, and will halt if the config file cannot be found. Use the \-f configfile option to specify your system's preferred config file location.
+.RE
+.PP
+\-q
+.RS 3n
+Quietly skip interactive prompts and helpful status messages which would otherwise be printed to stdout. Use two \-q's to silence errors which would otherwise be printed to stderr.
+.RE
+.PP
+\-v
+.RS 3n
+Operate verbosely. Some of the utilities in the DBMail suite can take two \-v's for extra verbosity. Those which don't understand this convention won't complain about having the extra \-v and will simply operate at their normal verbosity.
+.RE
+.PP
+\-V
+.RS 3n
+Show the version and copyright, then exit.
+.RE
+.PP
+\-h
+.RS 3n
+Show a brief summary of options, then exit.
+.RE
+.SH "EXAMPLES"
+After upgrading from DBMail 2.0, run this command to populate the cache tables:.sp
+dbmail\-util \-by.sp
+To set all messages flagged \\Deleted to the DELETE status, and to permanently purge all messages previously set to DELETE status:.sp
+dbmail\-util \-dpy.sp
+To get a listing of the changes that would be performed for all actions:.sp
+dbmail\-util \-an.sp
+To remove all IP log entries more than three days old:.sp
+dbmail\-util \-l 72h \-y.sp
+.SH "BUGS"
+If you experience inexplicable problems with DBMAil, please report the issue to the [1]\&\fIDBMail Bug Tracker\fR..sp
+.SH "LICENSE"
+DBMail and its components are distributed under the terms of the GNU General Public License. Copyrights are held variously by the authors listed below..sp
+.SH "AUTHOR(S)"
+DBMail is a collaborative effort among the core developers listed below and the tremendous help of the testers, patchers and bug hunters listed in the AUTHORS and THANKS files found in the DBMail source distribution..sp
+.sp
+.RS 3n
+.nf
+Eelco van Beek      Aaron Stone            Paul J Stevens
+Roel Rozendaal      Open Source Engineer   NFG Net Facilities Group BV
+Ilja Booij          Palo Alto, CA USA      http://www.nfg.nl
+IC&S                http://hydricacid.com
+Koningsweg 4
+3582 GE Utrecht
+http://www.ic\-s.nl
+.fi
+.RE
+.SH "REFERENCES"
+.TP 3
+1.\ DBMail Bug Tracker
+\%http://dbmail.org/index.php?page=bugs
diff --git a/man/dbmail-util.txt b/man/dbmail-util.txt
index 069900a6..6a057ec7 100644
--- a/man/dbmail-util.txt
+++ b/man/dbmail-util.txt
@@ -57,10 +57,13 @@ OPTIONS
  better to leave a grace period for old messages before permanently wiping
  them from the database.
 
+-r time::
+ Clear the reply cache used for autoreplies and Sieve vacations. The time is
+ specified as <hours>h<minutes>m (don't include the angle brackets, though!).
+
 -l time::
- Clear the IP log used for IMAP/POP-before-SMTP the time is specified
- as <hours>h<minutes>m (don't include the angle brackets,
- though!).
+ Clear the IP log used for IMAP/POP-before-SMTP. The time is specified as
+ <hours>h<minutes>m (don't include the angle brackets, though!).
 
 -n::
  Show the intended repairs without making any changes, i.e. no to all.
diff --git a/man/dbmail.1 b/man/dbmail.1
new file mode 100644
index 00000000..05c07902
--- /dev/null
+++ b/man/dbmail.1
@@ -0,0 +1,65 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "DBMAIL" 1 "" "" ""
+.SH NAME
+dbmail \- the Database Mailer, is a suite of mail storage and retrieval programs centered around a database backend.
+.SH "SYNOPSIS"
+
+
+See one of the following man pages for more information about the components of a DBMail system:
+
+.nf
+Configuration file \&. \&. \&. \&. dbmail\&.conf(5)
+Deliver mail \&. \&. \&. \&. \&. \&. \&. dbmail\-smtp(1)
+Manage user accounts \&. \&. \&. dbmail\-users(8)
+Export mailbox contents\&. \&. dbmail\-export(8)
+Manage Sieve scripts \&. \&. \&. dbmail\-sievecmd(8)
+Maintain health\&. \&. \&. \&. \&. \&. dbmail\-util(8)
+IMAP daemon\&. \&. \&. \&. \&. \&. \&. \&. dbmail\-imapd(8)
+POP3 daemon\&. \&. \&. \&. \&. \&. \&. \&. dbmail\-pop3d(8)
+LMTP daemon\&. \&. \&. \&. \&. \&. \&. \&. dbmail\-lmtpd(8)
+ManageSieve daemon \&. \&. \&. \&. dbmail\-timsieved(8)
+.fi
+
+.SH "BUGS"
+
+
+If you experience inexplicable problems with DBMAil, please report the issue to the DBMail Bug Tracker: \fIhttp://dbmail.org/index.php?page=bugs\fR\&.
+
+.SH "LICENSE"
+
+
+DBMail and its components are distributed under the terms of the GNU General Public License\&. Copyrights are held variously by the authors listed below\&.
+
+.SH "AUTHOR(S)"
+
+
+DBMail is a collaborative effort among the core developers listed below and the tremendous help of the testers, patchers and bug hunters listed in the AUTHORS and THANKS files found in the DBMail source distribution\&.
+
+.nf
+Eelco van Beek      Aaron Stone            Paul J Stevens
+Roel Rozendaal      Programmer             NFG Net Facilities Group BV
+Ilja Booij          Palo Alto, CA USA      http://www\&.nfg\&.nl
+IC&S                http://hydricacid\&.com
+Koningsweg 4
+3582 GE Utrecht
+http://www\&.ic\-s\&.nl
+.fi
+
diff --git a/man/dbmail.conf.5 b/man/dbmail.conf.5
new file mode 100644
index 00000000..4b3815f7
--- /dev/null
+++ b/man/dbmail.conf.5
@@ -0,0 +1,177 @@
+.\"     Title: dbmail.conf
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.71.0 <http://docbook.sf.net/>
+.\"      Date: 05/14/2007
+.\"    Manual: 
+.\"    Source: 
+.\"
+.TH "DBMAIL.CONF" "5" "05/14/2007" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+dbmail.conf \- configuration file for DBMail, the Database Mailer.
+.SH "SYNOPSIS"
+There are 8 sections: DBMAIL, SMTP, LMTP, POP, IMAP, SIEVE, LDAP, DELIVERY. The default config file already has documentation for all of the settings..sp
+.SH "DESCRIPTION"
+.sp
+.RS 3n
+.nf
+[DBMAIL]
+# Database settings
+driver=pgsql            # Supported drivers are mysql, pgsql, sqlite.
+authdriver=sql          # Supported drivers are sql, ldap.
+host=                   # Host for database, set to localhost if database is on
+                        #   the same host as dbmail and you want to use a local
+                        #   socket for connecting.
+sqlport=                # If you want to use TCP/IP for connecting to the database,
+                        #   and have the database running on a non\-standard port.
+sqlsocket=              # When using a local socket connection to the database, fill
+                        #   in the path to the socket here (e.g. /var/run/mysql.sock).
+user=dbmail             # Database username.
+pass=                   # Database password.
+db=dbmail               # Database name.
+table_prefix=dbmail_    # Table prefix. Defaults to "dbmail_" if not specified.
+encoding=utf8           # Encoding to match database/table encoding, e.g., latin1, utf8
+default_msg_encoding=utf8     # Default for messages without a known encoding, e.g., iso8859\-1, utf8
+.fi
+.RE
+.sp
+.RS 3n
+.nf
+postmaster=             # Postmaster's email address for use in bounce messages.
+sendmail=/usr/sbin/sendmail   # Sendmail executable for forwards, replies, notifies, vacations.
+                              # You may use pipes (|) in this command, for example:
+                              # dos2unix|/usr/sbin/sendmail  will work well with Qmail.
+                              # You may use quotes (") for executables with unusual names.
+.fi
+.RE
+.sp
+.RS 3n
+.nf
+# The following items can be overridden in the service\-specific sections.
+TRACE_SYSLOG=5          # Trace level to send to syslog. Default is 2 (messages, errors, fatals).
+TRACE_STDERR=2          # Trace level to send to stderr. Default is 0 (fatals).
+EFFECTIVE_USER=nobody   # Root privs are used to open a port, then privs
+EFFECTIVE_GROUP=nogroup #   are dropped down to the user/group specified here.
+BINDIP=*                # The IP address the services will bind to.
+                        #   Use * for all local interfaces.
+                        #   Use 127.0.0.1 for localhost only.
+NCHILDREN=2             # Default number of child processes to start.
+MAXCHILDREN=10          # Maximum number of child processes allowed.
+MINSPARECHILDREN=2      # Unused children to always have availale.
+MAXSPARECHILDREN=4      # Maximum unused children allowed to be active.
+MAXCONNECTS=10000       # Child process is restarted after handling this many connections.
+MAX_ERRORS=500          # Child process will restart after this many connection errors.
+TIMEOUT=300             # Idle time allowed before a connection is shut off.
+RESOLVE_IP=yes          # If yes, resolves IP addresses to DNS names when logging.
+log=/var/log/dbmail.log       # logfile for stdout messages
+error_log=/var/log/dbmail.err # logfile for stderr messages
+pid_directory=/var/run        # directory for storing PID files
+state_directory=/var/run      # directory for storing the daemon statefiles
+library_directory=/usr/lib/dbmail # directory for locating libraries
+.fi
+.RE
+.sp
+.RS 3n
+.nf
+[SMTP]
+                        # In fact, there isn't anything here by default.
+.fi
+.RE
+.sp
+.RS 3n
+.nf
+[LMTP]
+PORT=24                 # Port to bind to.
+.fi
+.RE
+.sp
+.RS 3n
+.nf
+[POP]
+PORT=110                # Port to bind to.
+POP_BEFORE_SMTP=no      # If yes, allows SMTP access from the host IP connecting by POP3.
+.fi
+.RE
+.sp
+.RS 3n
+.nf
+[IMAP]
+PORT=143                # Port to bind to.
+TIMEOUT=4000            # IMAP prefers a longer timeout than other services.
+IMAP_BEFORE_SMTP=no     # If yes, allows SMTP access from the host IP connecting by IMAP.
+.fi
+.RE
+.sp
+.RS 3n
+.nf
+[SIEVE]
+PORT=2000               # Port to bind to.
+.fi
+.RE
+.sp
+.RS 3n
+.nf
+[LDAP]
+PORT=389
+VERSION=3
+HOSTNAME=ldap
+BASE_DN=ou=People,dc=mydomain,dc=com
+BIND_DN=cn=admin,dc=mydomain,dc=com
+BIND_PW=password
+SCOPE=SubTree
+USER_OBJECTCLASS=top,account,dbmailUser
+FORW_OBJECTCLASS=top,account,dbmailForwardingAddress
+CN_STRING=uid
+FIELD_PASSWD=userPassword
+FIELD_UID=uid
+FIELD_NID=uidNumber
+MIN_NID=10000
+MAX_NID=15000
+FIELD_CID=gidNumber
+MIN_CID=10000
+MAX_CID=15000
+FIELD_MAIL=mail
+FIELD_QUOTA=mailQuota
+FIELD_FWDTARGET=mailForwardingAddress
+.fi
+.RE
+.sp
+.RS 3n
+.nf
+[DELIVERY]
+SIEVE=yes               # Run Sieve scripts as messages are delivered.
+SUBADDRESS=yes          # Use 'user+mailbox@domain' format to deliver to a mailbox.
+SIEVE_VACATION=yes      # Turn on/off the Sieve Vacation extension.
+SIEVE_NOTIFY=no         # Turn on/off the Sieve Notify extension (not supported).
+SIEVE_DEBUG=no          # Turn on/off additional Sieve debugging.
+AUTO_NOTIFY=no          # Use the auto_notify table to send email notifications.
+AUTO_REPLY=no           # Use the auto_reply table to send away messages.
+#AUTO_NOTIFY_SUBJECT    # Defaults to "NEW MAIL NOTIFICATION"
+#AUTO_NOTIFY_SENDER     # Defaults to POSTMASTER from the DBMAIL section.
+.fi
+.RE
+.SH "BUGS"
+If you experience inexplicable problems with DBMAil, please report the issue to the [1]\&\fIDBMail Bug Tracker\fR..sp
+.SH "LICENSE"
+DBMail and its components are distributed under the terms of the GNU General Public License. Copyrights are held variously by the authors listed below..sp
+.SH "AUTHOR(S)"
+DBMail is a collaborative effort among the core developers listed below and the tremendous help of the testers, patchers and bug hunters listed in the AUTHORS and THANKS files found in the DBMail source distribution..sp
+.sp
+.RS 3n
+.nf
+Eelco van Beek      Aaron Stone            Paul J Stevens
+Roel Rozendaal      Open Source Engineer   NFG Net Facilities Group BV
+Ilja Booij          Palo Alto, CA USA      http://www.nfg.nl
+IC&S                http://hydricacid.com
+Koningsweg 4
+3582 GE Utrecht
+http://www.ic\-s.nl
+.fi
+.RE
+.SH "REFERENCES"
+.TP 3
+1.\ DBMail Bug Tracker
+\%http://dbmail.org/index.php?page=bugs
diff --git a/man/dbmail.conf.txt b/man/dbmail.conf.txt
index 20ecf836..916b24ce 100644
--- a/man/dbmail.conf.txt
+++ b/man/dbmail.conf.txt
@@ -28,7 +28,10 @@ DESCRIPTION
   user=dbmail             # Database username.
   pass=                   # Database password.
   db=dbmail               # Database name.
-  #table_prefix=dbmail_   # Table prefix. Defaults to "dbmail_" if not specified.
+  table_prefix=dbmail_    # Table prefix. Defaults to "dbmail_" if not specified.
+  encoding=utf8           # Encoding to match database/table encoding, e.g., latin1, utf8
+  default_msg_encoding=utf8     # Default for messages without a known encoding, e.g., iso8859-1, utf8
+
   postmaster=             # Postmaster's email address for use in bounce messages.
   sendmail=/usr/sbin/sendmail	# Sendmail executable for forwards, replies, notifies, vacations.
                                 # You may use pipes (|) in this command, for example:
@@ -53,7 +56,9 @@ DESCRIPTION
   RESOLVE_IP=yes          # If yes, resolves IP addresses to DNS names when logging.
   log=/var/log/dbmail.log	# logfile for stdout messages
   error_log=/var/log/dbmail.err	# logfile for stderr messages
-  pid_dir=/var/run        # directory for storing PID files
+  pid_directory=/var/run        # directory for storing PID files
+  state_directory=/var/run      # directory for storing the daemon statefiles
+  library_directory=/usr/lib/dbmail # directory for locating libraries
    
   [SMTP]
                           # In fact, there isn't anything here by default.
diff --git a/man/footer.txt b/man/footer.txt
index 33591228..5fc9376b 100644
--- a/man/footer.txt
+++ b/man/footer.txt
@@ -16,7 +16,7 @@ the tremendous help of the testers, patchers and bug hunters listed in the
 AUTHORS and THANKS files found in the DBMail source distribution.
 
   Eelco van Beek      Aaron Stone            Paul J Stevens
-  Roel Rozendaal      Programmer             NFG Net Facilities Group BV
+  Roel Rozendaal      Open Source Engineer   NFG Net Facilities Group BV
   Ilja Booij          Palo Alto, CA USA      http://www.nfg.nl
   IC&S                http://hydricacid.com
   Koningsweg 4