#
# patch "ChangeLog"
#  from [cf64a1b3819ad5cc8319d99b94c1f873ff301acc]
#    to [2c0601680bef5505bf60cd4c4a060e581dac8b2c]
#
# patch "commands.cc"
#  from [d081b1c2d4e1d5be86e053b15d0b347d47695113]
#    to [c5293cbb4f245dffda5d6070c015405c159f55c4]
#
========================================================================
--- ChangeLog	cf64a1b3819ad5cc8319d99b94c1f873ff301acc
+++ ChangeLog	2c0601680bef5505bf60cd4c4a060e581dac8b2c
@@ -1,3 +1,7 @@
+2005-10-10  Benoît Dejean <address@hidden>
+
+	* commands.cc: s/key store/keystore/g.
+
 2005-10-10  Nathaniel Smith  <address@hidden>

 	* cert.{cc,hh} (get_user_key): New function, replacing
========================================================================
--- commands.cc	d081b1c2d4e1d5be86e053b15d0b347d47695113
+++ commands.cc	c5293cbb4f245dffda5d6070c015405c159f55c4
@@ -895,7 +895,7 @@

   if (app.keys.key_pair_exists(ident))
     {
-      P(F("dropping key pair '%s' from key store\n") % ident);
+      P(F("dropping key pair '%s' from keystore\n") % ident);
       app.keys.delete_key(ident);
       key_deleted = true;
     }
@@ -919,7 +919,7 @@
   internalize_rsa_keypair_id(idx(args, 0), ident);

   N(app.keys.key_pair_exists(ident),
-    F("key '%s' does not exist in the key store") % ident);
+    F("key '%s' does not exist in the keystore") % ident);

   keypair key;
   app.keys.get_key_pair(ident, key);
@@ -1882,7 +1882,7 @@

   rsa_keypair_id ident(idx(args, 0)());
   N(app.keys.key_pair_exists(ident),
-    F("public and private key '%s' do not exist in key store")
+    F("public and private key '%s' do not exist in keystore")
       % idx(args, 0)());

   packet_writer pw(cout);