X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/bfed046df118533fc599449d48e59a3100e6439d..8456ba1d493d5e5b46e450d0e8b2dd1577f246ab:/doc/misc/emacs-gnutls.texi diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi index 25bb9d05f3..1a850c6823 100644 --- a/doc/misc/emacs-gnutls.texi +++ b/doc/misc/emacs-gnutls.texi @@ -4,12 +4,12 @@ @setfilename ../../info/emacs-gnutls.info @settitle Emacs GnuTLS Integration @value{VERSION} -@documentencoding UTF-8 +@include docstyle.texi @copying This file describes the Emacs GnuTLS integration. -Copyright @copyright{} 2012--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2012--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -123,14 +123,15 @@ The @code{gnutls-trustfiles} variable is a list of trustfiles host name (although @code{gnutls-negotiate} supports a trustfile per connection so it could be done if needed). The trustfiles can be in PEM or DER format and examples can be found in most Unix -distributions. By default four locations are tried in this order: -@file{/etc/ssl/certs/ca-certificates.crt} for Debian, Ubuntu, Gentoo -and Arch Linux; @file{/etc/pki/tls/certs/ca-bundle.crt} for Fedora -and RHEL; @file{/etc/ssl/ca-bundle.pem} for Suse; -@file{/usr/ssl/certs/ca-bundle.crt} for Cygwin. You can easily -customize @code{gnutls-trustfiles} to be something else, but let us -know if you do, so we can make the change to benefit the other users -of that platform. +distributions. By default the following locations are tried in this +order: @file{/etc/ssl/certs/ca-certificates.crt} for Debian, Ubuntu, +Gentoo and Arch Linux; @file{/etc/pki/tls/certs/ca-bundle.crt} for +Fedora and RHEL; @file{/etc/ssl/ca-bundle.pem} for Suse; +@file{/usr/ssl/certs/ca-bundle.crt} for Cygwin; +@file{/usr/local/share/certs/ca-root-nss.crt} for FreeBSD. You can +easily customize @code{gnutls-trustfiles} to be something else, but +let us know if you do, so we can make the change to benefit the other +users of that platform. @end defvar @defvar gnutls-verify-error