Ibuffer: Mark buffers by content

[gnu-emacs] / lisp / net / tls.el

diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 72fb50ed923ecb2be99e3d76aa896c3f90db5ae3..f1219fdddbdb55ecdb00fadb01e33a4dcd8e12b4 100644 (file)
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -1,6 +1,6 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
-;; Copyright (C) 1996-1999, 2002-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2002-2016 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: comm, tls, gnutls, ssl
@@ -82,7 +82,8 @@ and `gnutls-cli' (version 2.0.1) output."
     "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
   "List of strings containing commands to start TLS stream to a host.
 Each entry in the list is tried until a connection is successful.
-%h is replaced with server hostname, %p with port to connect to.
+%h is replaced with the server hostname, %p with the port to
+connect to, and %t with a file name containing trusted certificates.
 The program should read input on stdin and write output to stdout.
 
 See `tls-checktrust' on how to check trusted root certs.