From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Tue, 20 Aug 2013 19:21:12 +0000 (+0000)
Subject: fix add-guest command
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=ff444ff6a62af8688d8f4ba6aedc26813cb095ca

fix add-guest command
---

diff --git a/input/howto/add-guest.creole b/input/howto/add-guest.creole
index 46999f7..35ccb83 100644
--- a/input/howto/add-guest.creole
+++ b/input/howto/add-guest.creole
@@ -2,21 +2,28 @@
 
 === add to guest keyring ===
 
-at home:
+first, import the guest key into your keyring:
+{{{
+	echo -n "New user's key fingerprint: " &&
+	read fingerprint &&
+	./add-key "`echo $fingerprint | tr -d ' '`" &&
+}}}
 
+then, add the guest's public gpg key into the guest keyring by
 {{{
-	cd projects/debian/d-a/guest-keyring
+	cd ~/dsa/guest-keyring
 }}}
 
-or whereever you keep the checkout.  Then
+or whereever you keep the checkout and executing:
 {{{
+
 	git pull &&
 	echo -n "New user's key fingerprint: " &&
 	read fingerprint &&
 	./add-key "`echo $fingerprint | tr -d ' '`" &&
 	git add debian-guest/add-"`echo $fingerprint | tr -d ' ' | cut -b 25-`" &&
 	git add debian-guest/index debian-guest/index.gpg &&
-	git ci &&
+	git commit -a &&
 	git push
 }}}