From 33ecb541fcc2e8030989384b5e8c55aeccd21128 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 20 Jul 2017 14:49:07 +0200
Subject: [PATCH] doc: Comment fixes and one trailing comma fix.

--
---
 doc/DETAILS        | 4 ++--
 g10/build-packet.c | 4 ++--
 g10/keydb.h        | 2 +-
 g10/packet.h       | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/DETAILS b/doc/DETAILS
index cbeead777..28fb55a2c 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -1348,7 +1348,7 @@ CREATE TABLE signatures (
   - 1 octet :: Key Source; i.e. the origin of the key:
                - 0 :: Unknown source.
                - 1 :: Public keyserver.
-               - 2 :: Preferred keysrver.
+               - 2 :: Preferred keyserver.
                - 3 :: OpenPGP DANE.
                - 4 :: Web Key Directory.
                - 5 :: Import from a trusted URL.
@@ -1538,5 +1538,5 @@ Description of some debug flags:
    If one of the "foo/*" names are used a "keygen.flags" prompt needs
    to be answered as well.  Instead of toggling the predefined flags,
    it is also possible to set them direct: Use a "=" character
-   directly followed by a comination of "a" (for authentication), "s"
+   directly followed by a combination of "a" (for authentication), "s"
    (for signing), or "c" (for certification).
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 6d00fc5c1..d4a1d6a53 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -182,8 +182,8 @@ build_packet (IOBUF out, PACKET *pkt)
 
 
 /* Build a packet and write it to the stream OUT.  This variant also
- * writes the meta data using ring tyrust packets.  Returns: 0 on
- * success or on aerror code.  */
+ * writes the meta data using ring trust packets.  Returns: 0 on
+ * success or on error code.  */
 gpg_error_t
 build_packet_and_meta (iobuf_t out, PACKET *pkt)
 {
diff --git a/g10/keydb.h b/g10/keydb.h
index 803987b8c..6416e634d 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -126,7 +126,7 @@ enum
     KEYORG_WKD     = 4, /* Web Key Directory.   */
     KEYORG_URL     = 5, /* Trusted URL.         */
     KEYORG_FILE    = 6, /* Trusted file.        */
-    KEYORG_SELF    = 7, /* We generated it.     */
+    KEYORG_SELF    = 7  /* We generated it.     */
   };
 
 
diff --git a/g10/packet.h b/g10/packet.h
index 56ac50376..8dca88b75 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -485,8 +485,8 @@ typedef struct {
 
 /* Subtypes for the ring trust packet.  */
 #define RING_TRUST_SIG 0  /* The classical signature cache.  */
-#define RING_TRUST_KEY 1  /* A KEYSRC on a primary key.      */
-#define RING_TRUST_UID 2  /* A KEYSRC on a user id.          */
+#define RING_TRUST_KEY 1  /* A KEYORG on a primary key.      */
+#define RING_TRUST_UID 2  /* A KEYORG on a user id.          */
 
 /* The local only ring trust packet which OpenPGP declares as
  * implementation defined.  GnuPG uses this to cache signature
@@ -498,7 +498,7 @@ typedef struct {
   unsigned int trustval;
   unsigned int sigcache;
   unsigned char subtype; /* The subtype of this ring trust packet.   */
-  unsigned char keyorg;  /* The origin of the key (KEYSRC_*).        */
+  unsigned char keyorg;  /* The origin of the key (KEYORG_*).        */
   u32 keyupdate;         /* The wall time the key was last updated.  */
   char *url;             /* NULL or the URL of the source.           */
 } PKT_ring_trust;