#
#
# patch "automate.cc"
#  from [1c29dbf96103bd040cda530c7bba9a2d3fb2fbfa]
#    to [07a200493d128042724e8d199dd4bdf43b187677]
# 
# patch "cmd_automate.cc"
#  from [88a358d86d112a98490c63d08415117835d85855]
#    to [f4c882636c51bc3125891dfba86c429bd3255f58]
# 
# patch "cmd_diff_log.cc"
#  from [3cbde32f82993189490ae13350e2f8fccaf1413d]
#    to [93703f1709343b831d11ad05c967ecf0de96c268]
# 
# patch "cmd_files.cc"
#  from [0dfcce69efa1db3806309191c49c427428ca5eeb]
#    to [7d84a312d2860156740e3bd7f68904758cbb1e78]
# 
# patch "monotone.texi"
#  from [9a5bc0aa6a16f714a4972b8d09d0a7042f11d9f0]
#    to [0bd73761d1ebd3033017bdc951c7a7f51da590aa]
# 
# patch "testsuite.lua"
#  from [98594f05af050a79f9a2665a99d077648a0c4e77]
#    to [a40a5cde8ce9b1a2e8b7d988106985b8a8d395c2]
#
============================================================
--- automate.cc	1c29dbf96103bd040cda530c7bba9a2d3fb2fbfa
+++ automate.cc	07a200493d128042724e8d199dd4bdf43b187677
@@ -167,7 +167,7 @@ AUTOMATE(descendents, N_("REV1 [REV2 [RE
 }
 
 
-// Name: erase_ancestors
+// Name: erase-ancestors
 // Arguments:
 //   0 or more: revision ids
 // Added in: 0.1
@@ -342,7 +342,7 @@ AUTOMATE(toposort, N_("[REV1 [REV2 [REV3
     output << (*i).inner()() << '\n';
 }
 
-// Name: ancestry_difference
+// Name: ancestry-difference
 // Arguments:
 //   1: a revision id
 //   0 or more further arguments: also revision ids
@@ -847,7 +847,7 @@ AUTOMATE(inventory, "", options::opts::n
     }
 }
 
-// Name: get_revision
+// Name: get-revision
 // Arguments:
 //   1: a revision id (optional, determined from the workspace if
 //      non-existant)
@@ -946,7 +946,7 @@ AUTOMATE(get_revision, N_("[REVID]"), op
   output.write(dat.inner()().data(), dat.inner()().size());
 }
 
-// Name: get_base_revision_id
+// Name: get-base-revision-id
 // Arguments: none
 // Added in: 2.0
 // Purpose: Prints the revision id the current workspace is based
@@ -968,7 +968,7 @@ AUTOMATE(get_base_revision_id, "", optio
   output << parent_id(parents.begin()) << '\n';
 }
 
-// Name: get_current_revision_id
+// Name: get-current-revision-id
 // Arguments: none
 // Added in: 2.0
 // Purpose: Prints the revision id of the current workspace. This is the
@@ -1002,7 +1002,7 @@ AUTOMATE(get_current_revision_id, "", op
   output << new_revision_id << '\n';
 }
 
-// Name: get_manifest_of
+// Name: get-manifest-of
 // Arguments:
 //   1: a revision id (optional, determined from the workspace if not given)
 // Added in: 2.0
@@ -1075,7 +1075,7 @@ AUTOMATE(get_manifest_of, N_("[REVID]"),
 }
 
 
-// Name: packet_for_rdata
+// Name: packet-for-rdata
 // Arguments:
 //   1: a revision id
 // Added in: 2.0
@@ -1129,7 +1129,7 @@ AUTOMATE(packets_for_certs, N_("REVID"),
     pw.consume_revision_cert(idx(certs,i));
 }
 
-// Name: packet_for_fdata
+// Name: packet-for-fdata
 // Arguments:
 //   1: a file id
 // Added in: 2.0
@@ -1155,7 +1155,7 @@ AUTOMATE(packet_for_fdata, N_("FILEID"),
   pw.consume_file_data(f_id,f_data);
 }
 
-// Name: packet_for_fdelta
+// Name: packet-for-fdelta
 // Arguments:
 //   1: a file id
 //   2: a file id
@@ -1188,7 +1188,7 @@ AUTOMATE(packet_for_fdelta, N_("OLD_FILE
   pw.consume_file_delta(f_old_id, f_new_id, file_delta(del));
 }
 
-// Name: common_ancestors
+// Name: common-ancestors
 // Arguments:
 //   1 or more revision ids
 // Added in: 2.1
@@ -1450,7 +1450,7 @@ AUTOMATE(genkey, N_("KEYID PASSPHRASE"),
 
 }
 
-// Name: get_option
+// Name: get-option
 // Arguments:
 //   1: an options name
 // Added in: 3.1
@@ -1458,7 +1458,7 @@ AUTOMATE(genkey, N_("KEYID PASSPHRASE"),
 //
 // Output format: A string
 //
-// Sample output (for 'mtn automate get_option branch:
+// Sample output (for 'mtn automate get-option branch:
 //   net.venge.monotone
 //
 AUTOMATE(get_option, N_("OPTION"), options::opts::none)
@@ -1490,7 +1490,7 @@ AUTOMATE(get_option, N_("OPTION"), optio
     N(false, F("'%s' is not a recognized workspace option") % opt);
 }
 
-// Name: get_content_changed
+// Name: get-content-changed
 // Arguments:
 //   1: a revision ID
 //   2: a file name
@@ -1507,7 +1507,7 @@ AUTOMATE(get_option, N_("OPTION"), optio
 //
 //   'content_mark'
 //         the hexadecimal id of the revision the content mark is attached to
-// Sample output (for 'mtn automate get_content_changed 3bccff99d08421df72519b61a4dded16d1139c33 ChangeLog):
+// Sample output (for 'mtn automate get-content-changed 3bccff99d08421df72519b61a4dded16d1139c33 ChangeLog):
 //   content_mark [276264b0b3f1e70fc1835a700e6e61bdbe4c3f2f]
 //
 AUTOMATE(get_content_changed, N_("REV FILE"), options::opts::none)
@@ -1545,7 +1545,7 @@ AUTOMATE(get_content_changed, N_("REV FI
     output.write(prt.buf.data(), prt.buf.size());
 }
 
-// Name: get_corresponding_path
+// Name: get-corresponding-path
 // Arguments:
 //   1: a source revision ID
 //   2: a file name (in the source revision)
@@ -1567,7 +1567,7 @@ AUTOMATE(get_content_changed, N_("REV FI
 //   'file'
 //         the file name corresponding to "file name" (arg 2) in the target revision
 //
-// Sample output (for automate get_corresponding_path 91f25c8ee830b11b52dd356c925161848d4274d0 foo2 dae0d8e3f944c82a9688bcd6af99f5b837b41968; see automate_get_corresponding_path test)
+// Sample output (for automate get-corresponding-path 91f25c8ee830b11b52dd356c925161848d4274d0 foo2 dae0d8e3f944c82a9688bcd6af99f5b837b41968; see automate_get_corresponding_path test)
 // file "foo"
 AUTOMATE(get_corresponding_path, N_("REV1 FILE REV2"), options::opts::none)
 {
@@ -1606,7 +1606,7 @@ AUTOMATE(get_corresponding_path, N_("REV
   output.write(prt.buf.data(), prt.buf.size());
 }
 
-// Name: put_file
+// Name: put-file
 // Arguments:
 //   base FILEID (optional)
 //   file contents (binary, intended for automate stdio use)
@@ -1661,7 +1661,7 @@ AUTOMATE(put_file, N_("[FILEID] CONTENTS
   output << sha1sum << '\n';
 }
 
-// Name: put_revision
+// Name: put-revision
 // Arguments:
 //   revision-data
 // Added in: 4.1
@@ -1749,7 +1749,7 @@ AUTOMATE(cert, N_("REVISION-ID NAME VALU
   guard.commit();
 }
 
-// Name: db_set
+// Name: db-set
 // Arguments:
 //   variable domain
 //   variable name
@@ -1773,7 +1773,7 @@ AUTOMATE(db_set, N_("DOMAIN NAME VALUE")
   app.db.set_var(key, var_value(value()));
 }
 
-// Name: db_get
+// Name: db-get
 // Arguments:
 //   variable domain
 //   variable name
============================================================
--- cmd_automate.cc	88a358d86d112a98490c63d08415117835d85855
+++ cmd_automate.cc	f4c882636c51bc3125891dfba86c429bd3255f58
@@ -75,7 +75,7 @@ static string const interface_version = 
 
 static string const interface_version = "4.1";
 
-// Name: interface_version
+// Name: interface-version
 // Arguments: none
 // Added in: 0.0
 // Purpose: Prints version of automation interface.  Major number increments
============================================================
--- cmd_diff_log.cc	3cbde32f82993189490ae13350e2f8fccaf1413d
+++ cmd_diff_log.cc	93703f1709343b831d11ad05c967ecf0de96c268
@@ -332,7 +332,7 @@ dump_diffs(cset const & cs,
   dump_diffs(cs, app, new_is_archived, output, dummy);
 }
 
-// common functionality for diff and automate content_diff to determine
+// common functionality for diff and automate content-diff to determine
 // revisions and rosters which should be diffed
 static void
 prepare_diff(cset & included,
@@ -512,7 +512,7 @@ CMD(diff, N_("informative"), N_("[PATH].
 }
 
 
-// Name: content_diff
+// Name: content-diff
 // Arguments:
 //   (optional) one or more files to include
 // Added in: 4.0
============================================================
--- cmd_files.cc	0dfcce69efa1db3806309191c49c427428ca5eeb
+++ cmd_files.cc	7d84a312d2860156740e3bd7f68904758cbb1e78
@@ -266,7 +266,7 @@ CMD(cat, N_("informative"),
   dump_file(cout, app, rid, idx(args, 0));
 }
 
-// Name: get_file
+// Name: get-file
 // Arguments:
 //   1: a file id
 // Added in: 1.0
@@ -285,7 +285,7 @@ AUTOMATE(get_file, N_("FILEID"), options
   dump_file(output, app, ident);
 }
 
-// Name: get_fileof
+// Name: get-file-of
 // Arguments:
 //   1: a filename
 //
============================================================
--- monotone.texi	9a5bc0aa6a16f714a4972b8d09d0a7042f11d9f0
+++ monotone.texi	0bd73761d1ebd3033017bdc951c7a7f51da590aa
@@ -1562,7 +1562,7 @@ @section Committing Work
 
 @smallexample
 @group
-$ mtn automate get_base_revision_id
+$ mtn automate get-base-revision-id
 2e24d49a48adf9acf3a1b6391a080008cbef9c21
 @end group
 @end smallexample
@@ -3624,7 +3624,7 @@ @section Using packets
 
 @smallexample
 @group
-$ mtn -d A automate get_revision a423db0ad651c74e41ab2529eca6f17513ccf714
+$ mtn -d A automate get-revision a423db0ad651c74e41ab2529eca6f17513ccf714
 format_version "1"
 
 new_manifest [b6dbdbbe0e7f41e44d9b72f9fe29b1f1a4f47f18]
@@ -3652,9 +3652,9 @@ @section Using packets
 
 @smallexample
 @group
-mtn -d A automate packet_for_fdata 8714e0ef31edb00e33683f575274379955b3526c > PACKETS
-mtn -d A automate packet_for_rdata a423db0ad651c74e41ab2529eca6f17513ccf714 >> PACKETS
-mtn -d A automate packets_for_certs a423db0ad651c74e41ab2529eca6f17513ccf714 >> PACKETS
+mtn -d A automate packet-for-fdata 8714e0ef31edb00e33683f575274379955b3526c > PACKETS
+mtn -d A automate packet-for-rdata a423db0ad651c74e41ab2529eca6f17513ccf714 >> PACKETS
+mtn -d A automate packets-for-certs a423db0ad651c74e41ab2529eca6f17513ccf714 >> PACKETS
 mtn -d B read < PACKETS
 @end group
 @end smallexample
@@ -3666,7 +3666,7 @@ @section Using packets
 
 @smallexample
 @group
-mtn -d A automate get_revision d14e89582ad9030e1eb62f563c8721be02ca0b65
+mtn -d A automate get-revision d14e89582ad9030e1eb62f563c8721be02ca0b65
 format_version "1"
 
 new_manifest [48a03530005d46ed9c31c8f83ad96c4fa22b8b28]
@@ -3687,10 +3687,10 @@ @section Using packets
 
 @smallexample
 @group
-mtn -d A automate packet_for_fdata d2178687226560032947c1deacb39d16a16ea5c6 > PACKETS2
-mtn -d A automate packet_for_fdelta 8714e0ef31edb00e33683f575274379955b3526c 8b52d96d4fab6c1e56d6364b0a2673f4111b228e >> PACKETS2
-mtn -d A automate packet_for_rdata d14e89582ad9030e1eb62f563c8721be02ca0b65 >> PACKETS2
-mtn -d A automate packets_for_certs d14e89582ad9030e1eb62f563c8721be02ca0b65 >> PACKETS2
+mtn -d A automate packet-for-fdata d2178687226560032947c1deacb39d16a16ea5c6 > PACKETS2
+mtn -d A automate packet-for-fdelta 8714e0ef31edb00e33683f575274379955b3526c 8b52d96d4fab6c1e56d6364b0a2673f4111b228e >> PACKETS2
+mtn -d A automate packet-for-rdata d14e89582ad9030e1eb62f563c8721be02ca0b65 >> PACKETS2
+mtn -d A automate packets-for-certs d14e89582ad9030e1eb62f563c8721be02ca0b65 >> PACKETS2
 mtn -d B read < PACKETS2
 @end group
 @end smallexample
@@ -5234,15 +5234,15 @@ @section Packet I/O
 data items around manually.
 
 @ftable @command
address@hidden mtn automate packets_for_certs @var{id}
address@hidden mtn automate packets-for-certs @var{id}
 
 This command prints out an @code{rcert} packet for each cert in your
 database associated with @var{id}. These can be used to transport
 certificates safely between monotone databases.  See @ref{Automation}
 for details of this command.
 
address@hidden mtn automate packet_for_fdata @var{id}
address@hidden mtn automate packet_for_rdata @var{id}
address@hidden mtn automate packet-for-fdata @var{id}
address@hidden mtn automate packet-for-rdata @var{id}
 
 These commands print out an @code{fdata} or @code{rdata} packet for
 the file, manifest or revision @var{id} in your database.  These can
@@ -5250,7 +5250,7 @@ @section Packet I/O
 between monotone databases.  See @ref{Automation} for details of these
 commands.
 
address@hidden mtn automate packet_for_fdelta @var{id1} @var{id2}
address@hidden mtn automate packet-for-fdelta @var{id1} @var{id2}
 
 This command prints out an @code{fdelta} packet for the differences
 between file versions @var{id1} and @var{id2}, in your database.
@@ -5545,7 +5545,7 @@ @section Automation
 
 
 @ftable @command
address@hidden mtn automate interface_version
address@hidden mtn automate interface-version
 
 @table @strong
 @item Arguments:
@@ -5658,7 +5658,7 @@ @section Automation
 @end table
 
 
address@hidden mtn automate common_ancestors @var{rev1} address@hidden [...]]
address@hidden mtn automate common-ancestors @var{rev1} address@hidden [...]]
 
 @table @strong
 @item Arguments:
@@ -5861,7 +5861,7 @@ @section Automation
 @end table
 
 
address@hidden mtn automate erase_ancestors address@hidden address@hidden [...]]]
address@hidden mtn automate erase-ancestors address@hidden address@hidden [...]]]
 
 @table @strong
 @item Arguments:
@@ -5943,7 +5943,7 @@ @section Automation
 @end table
 
 
address@hidden mtn automate ancestry_difference @var{new} address@hidden address@hidden [...]]]
address@hidden mtn automate ancestry-difference @var{new} address@hidden address@hidden [...]]]
 
 @table @strong
 @item Arguments:
@@ -6992,7 +6992,7 @@ @section Automation
 
 @end table
 
address@hidden mtn automate content_diff address@hidden address@hidden address@hidden ...]
address@hidden mtn automate content-diff address@hidden address@hidden address@hidden ...]
 
 @table @strong
 @item Arguments:
@@ -7213,7 +7213,7 @@ @section Automation
 
 @end table
 
address@hidden mtn automate packet_for_rdata @var{id}
address@hidden mtn automate packet-for-rdata @var{id}
 
 @table @strong
 @item Arguments:
@@ -7252,7 +7252,7 @@ @section Automation
 
 @end table
 
address@hidden mtn automate packet_for_certs @var{id}
address@hidden mtn automate packet-for-certs @var{id}
 
 @table @strong
 @item Arguments:
@@ -7317,7 +7317,7 @@ @section Automation
 
 @end table
 
address@hidden mtn automate packet_for_fdata @var{id}
address@hidden mtn automate packet-for-fdata @var{id}
 
 @table @strong
 @item Arguments:
@@ -7354,7 +7354,7 @@ @section Automation
 
 @end table
 
address@hidden mtn automate packet_for_fdelta @var{from-id} @var{to-id}
address@hidden mtn automate packet-for-fdelta @var{from-id} @var{to-id}
 
 @table @strong
 @item Arguments:
@@ -7477,7 +7477,7 @@ @section Automation
 
 @end table
 
address@hidden mtn automate db_get @var{domain} @var{name}
address@hidden mtn automate db-get @var{domain} @var{name}
 
 @table @strong 
 @item Arguments:
@@ -7530,7 +7530,7 @@ @section Automation
 @item Sample usage:
 
 @verbatim 
-mtn automate db_set database default-server off.net 
+mtn automate db-set database default-server off.net 
 @end verbatim
 
 @item Output format:
@@ -7543,7 +7543,7 @@ @section Automation
 
 @end table
 
address@hidden mtn automate put_file address@hidden @var{contents}
address@hidden mtn automate put-file address@hidden @var{contents}
 
 @table @strong 
 @item Arguments:
@@ -7559,7 +7559,7 @@ @section Automation
 @item Purpose:
 
 Preparation of a workspace-less commit. 
-See also @command{automate put_revision}. Normally used via 
+See also @command{automate put-revision}. Normally used via 
 @command{automate stdio}.
 
 @item Sample output:
@@ -7579,13 +7579,13 @@ @section Automation
 
 @end table
 
address@hidden mtn automate put_revision @var{revision-data}
address@hidden mtn automate put-revision @var{revision-data}
 
 @table @strong 
 @item Arguments:
 
 @var{revision-data} is the new revision. See example below.  Note that
-the new_manifest entry is ignored -- @command{put_revision} will
+the new_manifest entry is ignored -- @command{put-revision} will
 ignore whatever you put here and calculate the correct manifest id
 itself.  (However, for now, you must put 40 hex digits here -- it's
 just that which particular digits you put are entirely irrelevant.
@@ -7678,7 +7678,7 @@ @section RCS
 @section RCS
 
 @ftable @command
address@hidden mtn rcs_import @var{filename...}
address@hidden mtn rcs-import @var{filename...}
 
 This command imports all the file versions in each RCS file listed in
 @var{filename...}.  These files should be raw RCS files, ending in
============================================================
--- testsuite.lua	98594f05af050a79f9a2665a99d077648a0c4e77
+++ testsuite.lua	a40a5cde8ce9b1a2e8b7d988106985b8a8d395c2
@@ -155,7 +155,7 @@ function base_manifest()
 end
 
 function base_manifest()
-  check(safe_mtn("automate", "get_manifest_of", base_revision()), 0, false)
+  check(safe_mtn("automate", "get-manifest-of", base_revision()), 0, false)
   check(copy("ts-stdout", "base_manifest_temp"))
   return sha1("base_manifest_temp")
 end
@@ -190,13 +190,13 @@ function revert_to(rev, branch, mt)
   end
   if mt == nil then mt = mtn end
 
-  check(mt("automate", "get_manifest_of", base_revision()), 0, true, false)
+  check(mt("automate", "get-manifest-of", base_revision()), 0, true, false)
   rename("stdout", "paths-new")
 
   remove("_MTN.old")
   rename("_MTN", "_MTN.old")
 
-  check(mt("automate", "get_manifest_of", rev), 0, true, false)
+  check(mt("automate", "get-manifest-of", rev), 0, true, false)
   rename("stdout", "paths-old")
 
   -- remove all of the files and dirs in this