[Pkg-gnupg-commit] [gnupg2] 14/42: doc: Fix Dijkstra

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch upstream
in repository gnupg2.

commit 6391de3e62a275132664ae96497dd4e47fe9f257
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Dec 8 07:38:18 2017 +0100

    doc: Fix Dijkstra
    
    --
    
    Edsger Wybe Dijkstra (1930 --2002)
      - Dutch computer scientist
---
 agent/keyformat.txt | 4 ++--
 doc/HACKING         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/agent/keyformat.txt b/agent/keyformat.txt
index 768353f..2e48b34 100644
--- a/agent/keyformat.txt
+++ b/agent/keyformat.txt
@@ -379,7 +379,7 @@ Example:
 (protected-shared-secret
    ((desc "List of system passphrases")
     (key "uid-1002" ("Knuth" "Donald Ervin Knuth"))
-    (key "uid-1001" ("Dijkstra" "Edsgar Wybe Dijkstra"))
+    (key "uid-1001" ("Dijkstra" "Edsger Wybe Dijkstra"))
     (key)
     (protected mode (parms) encrypted_octet_string)
     (protected-at "20100915T111722")
@@ -402,7 +402,7 @@ hashed:
 
    ((desc "List of system passphrases")
     (key "uid-1002" ("Knuth" "Donald Ervin Knuth"))
-    (key "uid-1001" ("Dijkstra" "Edsgar Wybe Dijkstra"))
+    (key "uid-1001" ("Dijkstra" "Edsger Wybe Dijkstra"))
     (key)
     (value 4:1002 "signal flags at the lock")
     (value 4:1001 "taocp")
diff --git a/doc/HACKING b/doc/HACKING
index 62a6f95..bd16856 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -224,6 +224,7 @@ Note that such a comment will be removed if the git commit option
   - CVE-id :: CVE id number pertaining to this commit.
   - Regression-due-to :: Commit id of the regression fixed by this commit.
   - Fixes-commit :: Commit id this commit fixes.
+  - Updates-commit :: Commit id this commit updates.
   - Reported-by :: Value is a name or mail address of a bug reporte.
   - Suggested-by :: Value is a name or mail address of someone how
                     suggested this change.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git