From 4ac7cb0725219bda114c6992dfe6397f87d79c8a Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 21 Dec 2009 15:58:06 +0000
Subject: [PATCH] Fix some spelling errors.  Fixes bug#1127.

---
 g10/card-util.c   | 4 ++--
 g10/ccid-driver.c | 4 ++--
 g10/trustdb.c     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/g10/card-util.c b/g10/card-util.c
index 61fd3112e..96a994c98 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -948,7 +948,7 @@ change_cert (const char *args)
     }
   else
     {
-      tty_printf ("usage error: redirectrion to file required\n");
+      tty_printf ("usage error: redirection to file required\n");
       return -1;
     }
 
@@ -977,7 +977,7 @@ read_cert (const char *args)
     }
   else
     {
-      tty_printf ("usage error: redirectrion to file required\n");
+      tty_printf ("usage error: redirection to file required\n");
       return -1;
     }
 
diff --git a/g10/ccid-driver.c b/g10/ccid-driver.c
index 844058e0b..8c362d73c 100644
--- a/g10/ccid-driver.c
+++ b/g10/ccid-driver.c
@@ -845,11 +845,11 @@ parse_ccid_descriptor (ccid_driver_t handle,
   if ((us & 0x0020))
     DEBUGOUT ("    Auto baud rate change\n");
   if ((us & 0x0040))
-    DEBUGOUT ("    Auto parameter negotation made by CCID\n");
+    DEBUGOUT ("    Auto parameter negotiation made by CCID\n");
   else if ((us & 0x0080))
     DEBUGOUT ("    Auto PPS made by CCID\n");
   else if ((us & (0x0040 | 0x0080)))
-    DEBUGOUT ("    WARNING: conflicting negotation features\n");
+    DEBUGOUT ("    WARNING: conflicting negotiation features\n");
 
   if ((us & 0x0100))
     DEBUGOUT ("    CCID can set ICC in clock stop mode\n");
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 6fa082b3a..55ed7d210 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1657,7 +1657,7 @@ clean_sigs_from_uid(KBNODE keyblock,KBNODE uidnode,int noisy,int self_only)
       /* Everything else we delete */
 
       /* At this point, if 12 is set, the signing key was unavailable.
-	 If 9 or 10 is set, it's superceded.  Otherwise, it's
+	 If 9 or 10 is set, it's superseded.  Otherwise, it's
 	 invalid. */
 
       if(noisy)
@@ -1665,7 +1665,7 @@ clean_sigs_from_uid(KBNODE keyblock,KBNODE uidnode,int noisy,int self_only)
 		 keystr(node->pkt->pkt.signature->keyid),
 		 uidnode->pkt->pkt.user_id->name,
 		 node->flag&(1<<12)?"key unavailable":
-		 node->flag&(1<<9)?"signature superceded":"invalid signature");
+		 node->flag&(1<<9)?"signature superseded":"invalid signature");
 
       delete_kbnode(node);
       deleted++;