diff options
| author | Lars Magne Ingebrigtsen | 2014-11-25 16:34:55 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2014-11-25 16:34:55 +0100 |
| commit | cfe0d44ecbaf5fb79fbbe2a1dec8c722a289f266 (patch) | |
| tree | 1b7789ca2744f93cbe23a26fa9c0dd10a50f2da4 | |
| parent | ee4eb2810c4d9e5f4964d99e9ea9d3838f41f3d1 (diff) | |
| download | emacs-cfe0d44ecbaf5fb79fbbe2a1dec8c722a289f266.tar.gz emacs-cfe0d44ecbaf5fb79fbbe2a1dec8c722a289f266.zip | |
* misc.texi (Network Security): Use "untrustworthy" instead of "unsafe"
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/misc.texi | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 3db0e851603..e608248b263 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * misc.texi (Network Security): Use "untrustworthy" instead of | ||
| 4 | "unsafe". | ||
| 5 | |||
| 1 | 2014-11-24 Eli Zaretskii <eliz@gnu.org> | 6 | 2014-11-24 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * misc.texi (Network Security): Improve wording and indexing of | 8 | * misc.texi (Network Security): Improve wording and indexing of |
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index f2828c5426b..5bd0fc88b4e 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi | |||
| @@ -271,11 +271,12 @@ security checks are performed. | |||
| 271 | 271 | ||
| 272 | If this variable is @code{medium} (which is the default), a number of | 272 | If this variable is @code{medium} (which is the default), a number of |
| 273 | checks will be performed. If as result @acronym{NSM} determines that | 273 | checks will be performed. If as result @acronym{NSM} determines that |
| 274 | the network connection might be unsafe, it will make you aware of | 274 | the network connection might not be trustworthy, it will make you |
| 275 | that, and will ask you what to do about the network connection. | 275 | aware of that, and will ask you what to do about the network |
| 276 | connection. | ||
| 276 | 277 | ||
| 277 | You can decide to register a permanent security exception for an | 278 | You can decide to register a permanent security exception for an |
| 278 | unsafe connection, a temporary exception, or refuse the connection | 279 | unverified connection, a temporary exception, or refuse the connection |
| 279 | entirely. | 280 | entirely. |
| 280 | 281 | ||
| 281 | Below is a list of the checks done on the @code{medium} level. | 282 | Below is a list of the checks done on the @code{medium} level. |