From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 5 Feb 2016 07:13:34 +0000 (+1100)
Subject: Fix doc string of tls-program
X-Git-Tag: emacs-25.0.91~80
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc6eed2592da9262a9318f49e8ed6cc1f31d5c68;p=emacs.git

Fix doc string of tls-program

* lisp/net/tls.el (tls-program): Document the %t parameter (bug#22559).
---

diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 30895d043c8..f1219fdddbd 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -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.