#
#
# patch "automate.cc"
#  from [9c4d225aab0e5ce122674ac2bb6921ee6b0d9f6e]
#    to [c712156c747d83bdea00324322873d8ad7a964b7]
# 
# patch "cmd_automate.cc"
#  from [ae6e3bf90ed1c87f83be06b947ebf18dd2873b24]
#    to [1e71bcea2bb8448ab1a3b3f47748e89ea8c7aa93]
# 
# patch "cmd_list.cc"
#  from [9bd690b389ab8f218146de800075c97bdce7333f]
#    to [b1cc1e6fd712d484eb6698bb52d414d277272e89]
# 
# patch "monotone.texi"
#  from [b1ea779ac43cdb91cb9d2423910233493a612453]
#    to [b788c4a30206f2eacd2011dac65f79584488bd1a]
#
============================================================
--- automate.cc	9c4d225aab0e5ce122674ac2bb6921ee6b0d9f6e
+++ automate.cc	c712156c747d83bdea00324322873d8ad7a964b7
@@ -1768,7 +1768,7 @@ namespace
 //   1: the key ID
 //   2: the key passphrase
 // Added in: 3.1
-// Changed in: FIXME
+// Changed in: 10.0
 // Purpose: Generates a key with the given ID and passphrase
 //
 // Output format: a basic_io stanza for the new key, as for ls keys
============================================================
--- cmd_automate.cc	ae6e3bf90ed1c87f83be06b947ebf18dd2873b24
+++ cmd_automate.cc	1e71bcea2bb8448ab1a3b3f47748e89ea8c7aa93
@@ -71,7 +71,7 @@ namespace commands {
 // This number is only raised once, during the process of releasing a new
 // version of monotone, by the release manager. For more details, see
 // point (2) in notes/release-checklist.txt
-static string const interface_version = "9.0";
+static string const interface_version = "10.0";
 
 // Name: interface_version
 // Arguments: none
============================================================
--- cmd_list.cc	9bd690b389ab8f218146de800075c97bdce7333f
+++ cmd_list.cc	b1cc1e6fd712d484eb6698bb52d414d277272e89
@@ -645,13 +645,13 @@ namespace
 // Name: keys
 // Arguments: none
 // Added in: 1.1
+// Changed in: 10.0
 // Purpose: Prints all keys in the keystore, and if a database is given
 //   also all keys in the database, in basic_io format.
 // Output format: For each key, a basic_io stanza is printed. The items in
 //   the stanza are:
 //     name - the key identifier
-//     public_hash - the hash of the public half of the key
-//     private_hash - the hash of the private half of the key
+//     hash - the hash of the key
 //     public_location - where the public half of the key is stored
 //     private_location - where the private half of the key is stored
 //   The *_location items may have multiple values, as shown below
@@ -661,18 +661,16 @@ namespace
 //
 // Sample output:
 //               name "address@hidden"
-//        public_hash [475055ec71ad48f5dfaf875b0fea597b5cbbee64]
-//       private_hash [7f76dae3f91bb48f80f1871856d9d519770b7f8a]
+//               hash [475055ec71ad48f5dfaf875b0fea597b5cbbee64]
 //    public_location "database" "keystore"
 //   private_location "keystore"
 //
 //              name "address@hidden"
-//       public_hash [de84b575d5e47254393eba49dce9dc4db98ed42d]
+//              hash [de84b575d5e47254393eba49dce9dc4db98ed42d]
 //   public_location "database"
 //
 //               name "address@hidden"
-//        public_hash [7b6ce0bd83240438e7a8c7c207d8654881b763f6]
-//       private_hash [bfc3263e3257087f531168850801ccefc668312d]
+//               hash [7b6ce0bd83240438e7a8c7c207d8654881b763f6]
 //    public_location "keystore"
 //   private_location "keystore"
 //
============================================================
--- monotone.texi	b1ea779ac43cdb91cb9d2423910233493a612453
+++ monotone.texi	b788c4a30206f2eacd2011dac65f79584488bd1a
@@ -7689,7 +7689,7 @@ @section Automation
 @item Changes:
 @itemize
 @item
-FIXME -- The separate hashes for the private half of a key really didn't
+10.0 -- The separate hashes for the private half of a key really didn't
 make much sense; have one @code{hash [...]} line instead of separate
 @code{public_hash [...]} and @code{private_hash [...]} lines.
 @item
@@ -8458,7 +8458,7 @@ @section Automation
 
 @itemize
 @item
-FIXME -- The separate hashes for the private half of a key really didn't
+10.0 -- The separate hashes for the private half of a key really didn't
 make much sense; have one @code{hash [...]} line instead of separate
 @code{public_hash [...]} and @code{private_hash [...]} lines.
 @item