aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/processes.texi6
-rw-r--r--doc/misc/emacs-gnutls.texi2
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 14cd079c563..735e9fd7db4 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -2463,6 +2463,12 @@ that are mainly relevant to encrypted connections:
2463@item :nowait @var{boolean} 2463@item :nowait @var{boolean}
2464If non-@code{nil}, try to make an asynchronous connection. 2464If non-@code{nil}, try to make an asynchronous connection.
2465 2465
2466@item :coding @var{coding}
2467Use this to set the coding systems used by the network process, in
2468preference to binding @code{coding-system-for-read} or
2469@code{coding-system-for-write}. @xref{Network Processes} for
2470details.
2471
2466@item :type @var{type} 2472@item :type @var{type}
2467The type of connection. Options are: 2473The type of connection. Options are:
2468 2474
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index 555a4b1b56e..c3e69178fca 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -190,7 +190,7 @@ the connection process.
190 190
191The optional @var{parameters} argument is a list of keywords and 191The optional @var{parameters} argument is a list of keywords and
192values. The only keywords which currently have any effect are 192values. The only keywords which currently have any effect are
193@code{:client-certificate} and @code{:nowait}. 193@code{:client-certificate}, @code{:nowait}, and @code{:coding}.
194 194
195Passing @w{@code{:client certificate t}} triggers looking up of client 195Passing @w{@code{:client certificate t}} triggers looking up of client
196certificates matching @var{host} and @var{service} using the 196certificates matching @var{host} and @var{service} using the