From 06d2c5d793e2de2eff92b751c7076ffa32fb27f2 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 26 Jul 2008 01:04:40 -0400
Subject: [PATCH] more documentation for end users (and more FIXMEs), including
 README.admin in the build.

---
 Makefile   |  2 +-
 doc/README | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1a214fc..aaf9d65 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ keytrans:
 release: clean
 	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 	mkdir -p monkeysphere-$(MONKEYSPHERE_VERSION)/doc
-	ln -s ../../doc/README ../../doc/TODO ../../doc/MonkeySpec monkeysphere-$(MONKEYSPHERE_VERSION)/doc
+	ln -s ../../doc/README ../../doc/README.admin ../../doc/TODO ../../doc/MonkeySpec monkeysphere-$(MONKEYSPHERE_VERSION)/doc
 	ln -s ../COPYING ../etc ../Makefile ../man ../src  monkeysphere-$(MONKEYSPHERE_VERSION)
 	tar -ch monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
 	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
diff --git a/doc/README b/doc/README
index 7aa2850..5e6de8e 100644
--- a/doc/README
+++ b/doc/README
@@ -29,6 +29,25 @@ Using monkeysphere-ssh-proxycommand(1)
 FIXME: make a suggestion about how to integrate this in daily use.
 
 
+Setting up an OpenPGP authentication key
+----------------------------------------
+
+First things first: you'll need to create a new subkey for your
+current key, if you don't already have one.  If your OpenPGP key is
+keyid $GPGID, you can set up such a subkey relatively easily with:
+
+$ monkeysphere gen-subkey $GPGID
+
+Using your OpenPGP authentication key for SSH
+---------------------------------------------
+
+FIXME: Sending the key to the ssh-agent?
+
+FIXME: using the key with a single session?
+
+NOTE: the current version of openpgp2ssh does *not* deal well with
+encrypted keys (as of 2008-07-26)
+
 Miscellaneous
 -------------
 
-- 
2.26.2