diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/processes.texi | 10 | ||||
| -rw-r--r-- | doc/misc/auth.texi | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 5caf0a24265..fc5832253f9 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi | |||
| @@ -2521,11 +2521,11 @@ expect the network traffic to be encrypted. | |||
| 2521 | Either a list of the form @code{(@var{key-file} @var{cert-file})}, | 2521 | Either a list of the form @code{(@var{key-file} @var{cert-file})}, |
| 2522 | naming the certificate key file and certificate file itself, or | 2522 | naming the certificate key file and certificate file itself, or |
| 2523 | @code{t}, meaning to query @code{auth-source} for this information | 2523 | @code{t}, meaning to query @code{auth-source} for this information |
| 2524 | (@pxref{Help for users,,auth-source, auth, Emacs auth-source Library}). | 2524 | (@pxref{Help for users,,auth-source, auth, Emacs auth-source |
| 2525 | Only used for @acronym{TLS} or @acronym{STARTTLS}. If | 2525 | Library}). Only used for @acronym{TLS} or @acronym{STARTTLS}. To |
| 2526 | @code{:client-certificate} is not specified, behave as if it were t, | 2526 | enable automatic queries of @code{auth-source} when |
| 2527 | customize @code{network-stream-use-client-certificates} to change | 2527 | @code{:client-certificate} is not specified customize |
| 2528 | this. | 2528 | @code{network-stream-use-client-certificates} to t. |
| 2529 | 2529 | ||
| 2530 | @item :return-list @var{cons-or-nil} | 2530 | @item :return-list @var{cons-or-nil} |
| 2531 | The return value of this function. If omitted or @code{nil}, return a | 2531 | The return value of this function. If omitted or @code{nil}, return a |
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index 93a301dcb1a..415a64f0211 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/auth.texi | |||
| @@ -92,6 +92,7 @@ backends and you can write your own if you want. | |||
| 92 | @chapter Help for users | 92 | @chapter Help for users |
| 93 | 93 | ||
| 94 | ``Netrc'' files are a de facto standard. They look like this: | 94 | ``Netrc'' files are a de facto standard. They look like this: |
| 95 | |||
| 95 | @example | 96 | @example |
| 96 | machine @var{mymachine} login @var{myloginname} password @var{mypassword} port @var{myport} | 97 | machine @var{mymachine} login @var{myloginname} password @var{mypassword} port @var{myport} |
| 97 | @end example | 98 | @end example |
| @@ -108,12 +109,16 @@ The @code{user} is the user name. It's known as @var{:user} in | |||
| 108 | 109 | ||
| 109 | You can also use this file to specify client certificates to use when | 110 | You can also use this file to specify client certificates to use when |
| 110 | setting up TLS connections. The format is: | 111 | setting up TLS connections. The format is: |
| 112 | |||
| 111 | @example | 113 | @example |
| 112 | machine @var{mymachine} port @var{myport} key @var{key} cert @var{cert} | 114 | machine @var{mymachine} port @var{myport} key @var{key} cert @var{cert} |
| 113 | @end example | 115 | @end example |
| 114 | 116 | ||
| 115 | @var{key} and @var{cert} are filenames containing the key and | 117 | @var{key} and @var{cert} are filenames containing the key and |
| 116 | certificate to use respectively. | 118 | certificate to use respectively. In order to make network connections |
| 119 | use them automatically, either pass @code{:client-certificate t} to | ||
| 120 | @code{open-network-stream}, or customize | ||
| 121 | @code{network-stream-use-client-certificates} to @code{t}. | ||
| 117 | 122 | ||
| 118 | You can use spaces inside a password or other token by surrounding the | 123 | You can use spaces inside a password or other token by surrounding the |
| 119 | token with either single or double quotes. | 124 | token with either single or double quotes. |