From f013fb920d2e20efabe9dfbdb3a34674e9ef8f75 Mon Sep 17 00:00:00 2001 From: Nigel Metheringham Date: Mon, 16 Nov 2009 19:10:45 +0000 Subject: [PATCH] Documentation fix for gnutls_* options. Fixes: #913 --- doc/doc-docbook/spec.xfpt | 10 +++++----- doc/doc-txt/ChangeLog | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 984d63408..b640daec6 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -1,4 +1,4 @@ -. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.67 2009/11/14 20:35:54 nm4 Exp $ +. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.68 2009/11/16 19:10:45 nm4 Exp $ . . ///////////////////////////////////////////////////////////////////////////// . This is the primary source of the Exim Manual. It is an xfpt document that is @@ -21480,20 +21480,20 @@ being used, names are looked up using &[gethostbyname()]& instead of using the DNS. Of course, that function may in fact use the DNS, but it may also consult other sources of information such as &_/etc/hosts_&. -.option gnutls_require_kx main string unset +.option gnutls_require_kx smtp string unset This option controls the key exchange mechanisms when GnuTLS is used in an Exim client. For details, see section &<>&. -.option gnutls_require_mac main string unset +.option gnutls_require_mac smtp string unset This option controls the MAC algorithms when GnuTLS is used in an Exim client. For details, see section &<>&. -.option gnutls_require_protocols main string unset +.option gnutls_require_protocols smtp string unset This option controls the protocols when GnuTLS is used in an Exim client. For details, see section &<>&. .new -.option gnutls_compat_mode main boolean unset +.option gnutls_compat_mode smtp boolean unset This option controls whether GnuTLS is used in compatibility mode in an Exim server. This reduces security slightly, but improves interworking with older implementations of TLS. diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index fa71148fa..f823ee064 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.594 2009/11/14 20:35:55 nm4 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.595 2009/11/16 19:10:45 nm4 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -8,6 +8,8 @@ Exim version 4.71 TK/01 Bugzilla 912: Fix DKIM segfault on empty headers/body +NM/01 Bugzilla 913: Documentation fix for gnutls_* options. + Exim version 4.70 ----------------- -- 2.30.2