# 
# 
# patch "ChangeLog"
#  from [fb69a08cd849760aa4fa52e44ff0a0ba2d6d5899]
#    to [aaa6a8ed43643ecd6fa3acab4ceffeb7c07b872e]
# 
# patch "monotone.texi"
#  from [74e035d82a41dd0c58c9f9ff17e54c36626751c3]
#    to [747a3fccf86d4839ef070f8ba30c00b21e64d2d9]
# 
============================================================
--- ChangeLog	fb69a08cd849760aa4fa52e44ff0a0ba2d6d5899
+++ ChangeLog	aaa6a8ed43643ecd6fa3acab4ceffeb7c07b872e
@@ -1,3 +1,10 @@
+2006-01-26  Nathaniel Smith  <address@hidden>
+
+	* monotone.texi (Generating Keys, Network Service Revisited):
+	Clean up some key-related stuff -- genkey doesn't need a db, so
+	don't confuse the reader by giving it one, and update the sample
+	output too.
+
 2006-01-25  Matthew Gregan  <address@hidden>
 
 	* netsync.cc (session::rebuild_merkle_trees): Ticker header
============================================================
--- monotone.texi	74e035d82a41dd0c58c9f9ff17e54c36626751c3
+++ monotone.texi	747a3fccf86d4839ef070f8ba30c00b21e64d2d9
@@ -1158,11 +1158,11 @@
 
 @smallexample
 @group
-$ monotone --db=~/jim.db genkey jim@@juicebot.co.jp
+$ monotone genkey jim@@juicebot.co.jp
 monotone: generating key-pair 'jim@@juicebot.co.jp'
 enter passphrase for key ID [jim@@juicebot.co.jp] : @i{<Jim enters his passphrase>}
 confirm passphrase for key ID [jim@@juicebot.co.jp]: @i{<Jim confirms his passphrase>}
-monotone: storing key-pair 'jim@@juicebot.co.jp' in keystore
+monotone: storing key-pair 'jim@@juicebot.co.jp' in /home/jim/.monotone/keys
 @end group
 @end smallexample
 
@@ -1170,11 +1170,11 @@
 
 @smallexample
 @group
-$ monotone --db=~/abe.db genkey abe@@juicebot.co.jp
+$ monotone genkey abe@@juicebot.co.jp
 monotone: generating key-pair 'abe@@juicebot.co.jp'
 enter passphrase for key ID [abe@@juicebot.co.jp] : @i{<Abe enters his passphrase>}
 confirm passphrase for key ID [abe@@juicebot.co.jp]: @i{<Abe confirms his passphrase>}
-monotone: storing key-pair 'abe@@juicebot.co.jp' in keystore
+monotone: storing key-pair 'abe@@juicebot.co.jp' in /home/abe/.monotone/keys
 @end group
 @end smallexample
 
@@ -1182,11 +1182,11 @@
 
 @smallexample
 @group
-$ monotone --db=~/beth.db genkey beth@@juicebot.co.jp
+$ monotone genkey beth@@juicebot.co.jp
 monotone: generating key-pair 'beth@@juicebot.co.jp'
 enter passphrase for key ID [beth@@juicebot.co.jp] : @i{<Beth enters her passphrase>}
 confirm passphrase for key ID [beth@@juicebot.co.jp]: @i{<Beth confirms her passphrase>}
-monotone: storing key-pair 'beth@@juicebot.co.jp' in keystore
+monotone: storing key-pair 'beth@@juicebot.co.jp' in /home/beth/.monotone/keys
 @end group
 @end smallexample
 
@@ -1200,7 +1200,7 @@
 
 [public keys]
 9e9e9ef1d515ad58bfaa5cf282b4a872d8fda00c jim@@juicebot.co.jp   (*)
-(*) - only in keystore
+(*) - only in /home/jim/.monotone/monotonerc
 
 
 [private keys]
@@ -2327,11 +2327,11 @@
 @smallexample
 @group
 $ monotone --db=server.db db init
-$ monotone --db=server.db genkey monotone-server@@www.juicebot.co.jp
+$ monotone genkey monotone-server@@www.juicebot.co.jp
 monotone: generating key-pair 'monotone-server@@www.juicebot.co.jp'
 enter passphrase for key ID [monotone-server@@www.juicebot.co.jp] : @i{<Jim enters a new passphrase>}
 confirm passphrase for key ID [monotone-server@@www.juicebot.co.jp]: @i{<Jim confirms the passphrase>}
-monotone: storing key-pair 'monotone-server@@www.juicebot.co.jp' in keystore
+monotone: storing key-pair 'monotone-server@@www.juicebot.co.jp' in /home/jim/.monotone/keys
 $ cat abe.pubkey beth.pubkey jim.pubkey | monotone --db=server.db read
 monotone: read 3 packets
 @end group