diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-08-07 09:34:03 +0200 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-08-07 09:35:41 +0200 |
| commit | a611cba142470c52f3303c512f77ae7d195cc41f (patch) | |
| tree | 99543587d881ea796ce9df02feac92757d19f8fc /doc/gpg.texi | |
| parent | Simple typo fix. (diff) | |
| download | gnupg2-a611cba142470c52f3303c512f77ae7d195cc41f.tar.xz gnupg2-a611cba142470c52f3303c512f77ae7d195cc41f.zip | |
Fix spelling.
* doc/gpg.texi: s/occured/occurred/
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Diffstat (limited to 'doc/gpg.texi')
| -rw-r--r-- | doc/gpg.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index 19398e63b..ba7f5a5c6 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -1644,7 +1644,7 @@ Set what trust model GnuPG should follow. The models are: time a key is seen, it is memorized. If later another key with a user id with the same email address is seen, both keys are marked as suspect. In that case, the next time either is used, a warning is - displayed describing the conflict, why it might have occured + displayed describing the conflict, why it might have occurred (either the user generated a new key and failed to cross sign the old and new keys, the key is forgery, or a man-in-the-middle attack is being attempted), and the user is prompted to manually confirm |