diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/network-stream.el | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 026b99872f0..16cf1e347a1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-04-18 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * net/network-stream.el (open-network-stream): Doc fix. | ||
| 4 | |||
| 1 | 2012-04-17 Chong Yidong <cyd@gnu.org> | 5 | 2012-04-17 Chong Yidong <cyd@gnu.org> |
| 2 | 6 | ||
| 3 | * emacs-lisp/tabulated-list.el (tabulated-list-print): Fix typos. | 7 | * emacs-lisp/tabulated-list.el (tabulated-list-print): Fix typos. |
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index 7a3d47ef1d1..81d05eabc5a 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el | |||
| @@ -125,9 +125,8 @@ values: | |||
| 125 | certificate. This parameter will only be used when doing TLS | 125 | certificate. This parameter will only be used when doing TLS |
| 126 | or STARTTLS connections. | 126 | or STARTTLS connections. |
| 127 | 127 | ||
| 128 | If :use-starttls-if-possible is non-nil, do opportunistic | 128 | :use-starttls-if-possible is a boolean that says to do opportunistic |
| 129 | STARTTLS upgrades even if Emacs doesn't have built-in TLS | 129 | STARTTLS upgrades even if Emacs doesn't have built-in TLS functionality. |
| 130 | functionality. | ||
| 131 | 130 | ||
| 132 | :nowait is a boolean that says the connection should be made | 131 | :nowait is a boolean that says the connection should be made |
| 133 | asynchronously, if possible." | 132 | asynchronously, if possible." |