[continued from previous message]

+ # - Absolute form where used options are listed
+ # - Additive form where changes from compile
+ # time default are listed:
+ # +implicit-tls -implicit-tls
+ # +starttls -starttls (see note [2])
+ # +verify-tls-certificate
+ # -verify-tls-certificate
+ # +require-tls-peer-name
+ # -require-tls-peer-name
+ # These two forms can not be mixed.
+ #
+ # This option requires
+ # use-connect-library = tls
+ #
+ # Note 1: 'implicit-tls' is default if
+ # use-config-library = tls
+ # is used.
+ #
+ # Note 2: Specifying tls:starttls-version on ~/.elm/mail.services or on
+ # global elm.mailservices overrides starttls disable given on use-tls setting.
+ #
+ # Note 3: Specifying require-tls-peer-name={name} on ~/.elm/mail.services or on global
+ # elm.mailservices can used to make 'require-tls-peer-name' on use-tls accept
+ # also other certificate's CN than given hostname.
+ #
+ # Note 4: 'require-tls-peer-name' checks certificate's CN when correct name is usually
+ # certificate's 'Subject Alternative Name' (SAN). 'require-tls-peer-name' checks
+ # check DSN:name from 'Subject Alternative Name' (SAN) if openssl provides
+ # X509_check_host() and name is not IP-address. Therefore it is usually not
+ # good idea to use 'require-tls-peer-name' on use-tls setting if OpenSSL
+ # is older than 1.0.2 where X509_check_host() is not availabe.
+ # 'require-tls-peer-name' do not use X509_check_ip() to check IP address
+ # from IP:name of 'Subject Alternative Name' (SAN).
+ #
+ # Note 5: Specifying verify-tls-certificate=off on ~/.elm/mail.services or on global
+ # elm.mailservices overrides verify-tls-certificate given on use-tls setting.
+ #
+ # Note 6: Specifying use-tls-checks=no on ~/.elm/mail.services or on global
+ # elm.mailservices overrides 'verify-tls-certificate' and 'require-tls-peer-name'
+ # given on use-tls setting.
+ #
+ # Note 7: 'display-check-host' is default if
+ # use-config-library = tls
+ # is used and openssl provides X509_check_host(). That 'display-check-host'
+ # checks hostname against DSN:name from 'Subject Alternative Name' (SAN)
+ # and prints "host matches" if X509_check_ip() succeed and hostname is not
+ # ip address.
+
+ user-conf-rewrite
+ # Allows automatic resorting aand rewriting of some
+ # user configuration files on elm's startup
+ #
+ # Currently ~/.elm/elmaliases is rewritten.
+
+ userlevel
+ # Are we good at it? 0=beginner, 1=intermediate, 2 and above=expert.
+ # Lower levels give more verbose prompts. Higher levels make advanced
+ # options available.
+
+ usetite
+ # Would you like to use termcap/terminfo ti/te (screen switch) entries?
+
valid-domains
# List of mail domains (that is everything after '@' on mail address)
# are considered valid without verifying domain on mail address. ***************
*** 308,353 ****
# name-lookup-cache-time, static-hosts-max-names,
# address-lookup

- address-lookup
- # This option specifies how translation from ip-address to hostname
- # is done.
- #
- # Possible values:
- #
- # normal Use normal address -lookup API
- # (thayt is gethostbyaddr()).
- # gethostbyaddr Use gethostbyaddr()
- # getnameinfo Use getnameinfo()
- #
- # Note that getnameinfo() can return only one name for ip-address.
- #
- # See also: mail-services-lookup

- ipv6-scope-id
- # This option tells how textual (non-numeric) scope id's (part after %
- # character) on numerical IPv6 addresses are interpreted
- #
- # This option includes list of keywords:
- # auto sets link-local-if-index flag
- # if numeric scope id's of link
- # local addresses matches to interface
- # index on where address is located
- # link-local-if-index use interface index as scope id
- # for link local IPv6 addresses and
- # print scope id on textual form
- #
- # This option accepts two forms:
- # - Absolute form where used options are listed
- # - Additive form where changes from compile
- # time default (or changes from global elm.rc
- # on user's elmrc) are listed:
- # +auto -auto
- # +link-local-if-index -link-local-if-index
- #
- # If auto -flag is active after global elm.rc, that
- # IPv6 addresses check is done before user's elmrc is read
- #
- # See also: mail-services-lookup

name-lookup-cache-time
# Default cache time on seconds for name service lookups,
--- 576,582 ----
***************
*** 360,436 ****
#
# See also: mail-services-lookup, static-hosts-max-names

- name-lookup-cancel
- # This option enabled cancelable dns lookups. This may require
- # that resolv -module is enabled. Used for "mail-services-lookup"
- # and "verify-domain".
- #
- # Possible values:
- #
- # disabled hostname / mail domain name
- # lookups are not interruptible.
- # enabled hostname / mail domain name
- # lookups are assumed to be
- # interruptible (but that is
- # not likely not work with
- # gethostbyname(), getaddrinfo(),
- # res_query() and res_search()).
- # auto hostname / mail domain names
- # lookup result waiting is
- # inter