[gnus git] branch master updated: m0-13-125-g8b77934 =1= Fix doc string of tls-program

Katsumi Yamaoka <[email protected]> Fri, 05 Feb 2016 12:25:14 +0100
Newsgroups gmane.emacs.gnus.cvs
Message-ID <[email protected]>
       via  8b77934fd25e156865bb70cf836337b13b2cdf8b (commit)
      from  a2f546c9c8a27317f81861ebdce22e182514a368 (commit)


- Log -----------------------------------------------------------------
commit 8b77934fd25e156865bb70cf836337b13b2cdf8b
Author: Lars Ingebrigtsen <[email protected]>
Date:   Fri Feb 5 11:24:38 2016 +0000

    Fix doc string of tls-program
    
    * tls.el (tls-program): Document the %t parameter (bug#22559).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 287feab..40f845d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-05  Lars Ingebrigtsen  <[email protected]>
+
+	Fix doc string of tls-program.
+
+	* tls.el (tls-program): Document the %t parameter (bug#22559).
+
 2016-02-04  Paul Eggert  <[email protected]>
 
 	Quoting fixes in doc strings and diagnostics.
diff --git a/lisp/tls.el b/lisp/tls.el
index 3e5d974..0b30f71 100644
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -79,7 +79,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.

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    6 ++++++
 lisp/tls.el    |    3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project