3 files changed, 2 insertions, 27 deletions
diff --git a/doc/HACKING b/doc/HACKING
index e7174793e..fc0c3f459 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -168,13 +168,13 @@ Note that such a comment will be removed if the git commit option
     that the freed variable is not anymore used, explicitly set the
     variable to NULL.
   - New code shall in general use xtrymalloc or xtrycalloc and check
-    for an error (use gpg_error_from_errno()).
+    for an error (use gpg_error_from_syserror()).
   - Init function local variables only if needed so that the compiler
     can do a better job in detecting uninitialized variables which may
     indicate a problem with the code.
   - Never init static or file local variables to 0 to make sure they
     end up in BSS.
-  - But extra parenthesis around terms with binary operators to make
+  - Put extra parenthesis around terms with binary operators to make
     it clear that the binary operator was indeed intended.
   - Use --enable-maintainer-mode with configure so that all suitable
     warnings are enabled.
diff --git a/g10/OPTIONS b/g10/OPTIONS
deleted file mode 100644
index b1a49e254..000000000
--- a/g10/OPTIONS
+++ /dev/null
@@ -1,24 +0,0 @@
-# Some notes used by the maintainers
-
-
-store
-# simply packs the input data into a rfc1991 packet format
-
-check-trustdb
-
-
-compress-keys
-# compress exported key, compress level is still set with "-z" and
-# algorithm with --compress-algo" - Default is to not compress keys, as
-# this is better for interoperability.
-
-compress-sigs
-# Normally, compressing of signatures does not make sense; so this
-# is disabled for detached signatures unless this option is used.
-
-run-as-shm-coprocess [request-locked-shm-size]
-# very special :-)
-# You will have to use "--status-fd" too
-# Note:  This option does only work if given on the command line.
-
-
diff --git a/g10/options.h b/g10/options.h
index def638591..c634f0ffd 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -148,7 +148,6 @@ struct
     {
       KF_DEFAULT, KF_NONE, KF_SHORT, KF_LONG, KF_0xSHORT, KF_0xLONG
     } keyid_format;
-  int shm_coprocess;
   const char *set_filename;
   strlist_t comments;
   int throw_keyids;