From a611cba142470c52f3303c512f77ae7d195cc41f Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 7 Aug 2017 03:34:03 -0400 Subject: [PATCH] Fix spelling. * doc/gpg.texi: s/occured/occurred/ Signed-off-by: Daniel Kahn Gillmor --- doc/gpg.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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