Bump version to 4.74.

Docs deliberately keep changebars since v4.72 as 4.73 has not been out
for long.

OptionLists updates for dynamic modules and for the security changes
from 4.73.

4 files changed, 11 insertions, 6 deletions

diff --git a/doc/doc-docbook/filter.xfpt b/doc/doc-docbook/filter.xfpt
index 40663564b..d60277a11 100644
--- a/doc/doc-docbook/filter.xfpt
+++ b/doc/doc-docbook/filter.xfpt
@@ -65,7 +65,7 @@
 <author><firstname>Philip</firstname><surname>Hazel</surname></author>
 <authorinitials>PH</authorinitials>
 <revhistory><revision>
-  <revnumber>4.73</revnumber>
+  <revnumber>4.74</revnumber>
   <date>19 Nov 2010</date>
   <authorinitials>PH</authorinitials>
 </revision></revhistory>
@@ -80,7 +80,7 @@
 .chapter "Forwarding and filtering in Exim" "CHAPforandfilt"
 This document describes the user interfaces to Exim's in-built mail filtering
 facilities, and is copyright &copy; University of Cambridge 2007. It
-corresponds to Exim version 4.73.
+corresponds to Exim version 4.74.
 
 
 
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 160410bd3..fa73e5081 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -48,7 +48,7 @@
 . /////////////////////////////////////////////////////////////////////////////
 
 .set previousversion "4.72"
-.set version "4.73"
+.set version "4.74"
 
 .set ACL "access control lists (ACLs)"
 .set I   "&nbsp;&nbsp;&nbsp;&nbsp;"
diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 00bafe9c5..b9b4b0e15 100644
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -773,7 +773,6 @@ Option                       Type         Description
 ------------------------------------------------------------------------------
 
 ALT_CONFIG_PREFIX            optional     restricts location of -C files
-ALT_CONFIG_ROOT_ONLY         optional*    privileged -C needs root (not exim)
 APPENDFILE_MODE              optional*
 APPENDFILE_DIRECTORY_MODE    optional*
 APPENDFILE_LOCKFILE_MODE     optional*
@@ -788,6 +787,7 @@ BASE_62=62                   optional*    not normally changed for Unix
 BIN_DIRECTORY                mandatory    Exim binary directory
 CC                           system**     C compiler
 CFLAGS                       system**     flags for C compiler
+CFLAGS_DYNAMIC               system**     extra flags needed for .so modules
 CHGRP_COMMAND                system**     path to chgrp
 CHOWN_COMMAND                system**     path to chown
 COMPRESS_COMMAND             system       path to a compress command
@@ -860,6 +860,7 @@ LOOKUP_INCLUDE               lookup       include files for lookups
 LOOKUP_LDAP                  lookup       include ldap lookup
 LOOKUP_LIBS                  lookup       include libraries for lookups
 LOOKUP_LSEARCH               lookup       include all lsearch lookups
+LOOKUP_MODULE_DIR            optional*    where dynamic lookup modules live
 LOOKUP_MYSQL                 lookup       include mysql lookup
 LOOKUP_NIS                   lookup       include nis lookup
 LOOKUP_NISPLUS               lookup       include nisplus lookup
@@ -867,6 +868,8 @@ LOOKUP_ORACLE                lookup       include oracle lookup
 LOOKUP_PGSQL                 lookup       include pgsql lookup
 LOOKUP_TESTDB                lookup*
 LOOKUP_WHOSON                lookup       include whoson lookup
+LOOKUP_*_INCLUDE             optional*    include files for dynamic module
+LOOKUP_*_LIBS                optional*    libraries for dynamic module
 MAKE_SHELL                   optional*    shell to use for make
 MAX_FILTER_SIZE              optional*    max file size for filter files
 MAX_INCLUDE_SIZE             optional*    max file size for :include: files
@@ -910,7 +913,7 @@ SUPPORT_TRANSLATE_IP_ADDRESS optional*    support for address translation
 SYSLOG_LOG_PID               optional     add pid to syslog lines
 SYSLOG_LONG_LINES            optional     do not split long syslog lines
 SYSTEM_ALIASES_FILE          optional     defaults to /etc/aliases
-TCP_WRAPPERS_DAEMON_NAME     system*      daemon name used by tcpwrappers libraru
+TCP_WRAPPERS_DAEMON_NAME     system*      daemon name used by tcpwrappers library
 TIMEZONE_DEFAULT             optional     default for timezone option
 TLS_INCLUDE                  optional     path to include files for TLS
 TLS_LIBS                     optional     additional libraries for TLS
@@ -920,11 +923,13 @@ TRANSPORT_AUTOREPLY          driver       include autoreply transport
 TRANSPORT_LMTP               driver       include lmtp transport
 TRANSPORT_PIPE               driver       include pipe transport
 TRANSPORT_SMTP               driver       include smtp transport
+TRUSTED_CONFIG_LIST          optional     config files safe to retain privileges
 USE_DB                       system**     use native DB interface
 USE_GNUTLS                   optional     use GnuTLS instead of OpenSSL
 USE_READLINE                 optional     try to load libreadline for -be
 USE_TCP_WRAPPERS             system       link with tcpwrappers
 USE_TDB                      optional     use the tdb DB interface
+WHITELIST_D_MACROS           optional     -Dmacros safe to retain privileges with
 WITH_OLD_CLAMAV_STREAM       optional*    use ClamAV API from before ClamAV 0.95
 X11                          system**     X11 base directory
 X11_LD_LIB                   system**     X11 link library
diff --git a/src/src/version.h b/src/src/version.h
index 4e544e056..fff4d0b24 100644
--- a/src/src/version.h
+++ b/src/src/version.h
@@ -6,7 +6,7 @@
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This is bumped by the Exim Maintainers, the release engineer: */
-#define EXIM_RELEASE_VERSION_STR        "4.73"
+#define EXIM_RELEASE_VERSION_STR        "4.74"
 /* If you apply extensive local patches, consider putting -foo into here */
 #define EXIM_VARIANT_VERSION            ""