# 
# 
# patch "ChangeLog"
#  from [4d446a567c42ef0a8adef491d037b2576b1ae345]
#    to [1dfdd66ef55d0d9ec0d3bc97aa00d9d685075d39]
# 
# patch "monotone.texi"
#  from [03e2f3c1e2db9abffb627b4df9d1977361dbf97e]
#    to [ff023633331816e19ac5c26d54ab83b3c07f29b4]
# 
============================================================
--- ChangeLog	4d446a567c42ef0a8adef491d037b2576b1ae345
+++ ChangeLog	1dfdd66ef55d0d9ec0d3bc97aa00d9d685075d39
@@ -1,3 +1,8 @@
+2006-04-25  Jeronimo Pellegrini  <address@hidden>
+
+	* monotone.texi: Replace many references to 'monotone' with
+	'mtn'.
+
 2006-04-23  Nathaniel Smith  <address@hidden>
 
 	* commands.cc (attr): Use get_base_and_current_roster_shape
============================================================
--- monotone.texi	03e2f3c1e2db9abffb627b4df9d1977361dbf97e
+++ monotone.texi	ff023633331816e19ac5c26d54ab83b3c07f29b4
@@ -1666,7 +1666,7 @@
 
 @smallexample
 @group
-$ cat ~/abe.pubkey ~/beth.pubkey | monotone --db=~/jim.mtn read
+$ cat ~/abe.pubkey ~/beth.pubkey | mtn --db=~/jim.mtn read
 mtn: read 2 packets
 @end group
 @end smallexample
@@ -2375,7 +2375,7 @@
 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>}
 mtn: storing key-pair 'monotone-server@@www.juicebot.co.jp' in /home/jim/.monotone/keys
-$ cat abe.pubkey beth.pubkey jim.pubkey | monotone --db=server.mtn read
+$ cat abe.pubkey beth.pubkey jim.pubkey | mtn --db=server.mtn read
 mtn: read 3 packets
 @end group
 @end smallexample
@@ -3684,8 +3684,8 @@
 @section Tree
 
 @ftable @command
address@hidden monotone cat @var{path}
address@hidden monotone cat address@hidden @var{path}
address@hidden mtn cat @var{path}
address@hidden mtn cat address@hidden @var{path}
 
 Write the contents of a specific file @var{path} to standard output.
 
@@ -3696,10 +3696,10 @@
 With an explicit @option{--revision} argument, the command outputs
 contents of @var{path} at that revision.
 
address@hidden monotone checkout address@hidden @var{directory}
address@hidden monotone co address@hidden @var{directory}
address@hidden monotone address@hidden checkout @var{directory}
address@hidden monotone address@hidden co @var{directory}
address@hidden mtn checkout address@hidden @var{directory}
address@hidden mtn co address@hidden @var{directory}
address@hidden mtn address@hidden checkout @var{directory}
address@hidden mtn address@hidden co @var{directory}
 
 These commands copy a revision @var{id} out of your database, writing
 the string @var{id} into the file
@@ -3742,7 +3742,7 @@
 @var{id} as the unique head of @var{branchname} if it exists.
 
 
address@hidden monotone disapprove @var{id}
address@hidden mtn disapprove @var{id}
 
 This command records a disapproval of the changes between @var{id}'s
 ancestor and @var{id}. It does this by committing the @i{inverse}
@@ -3759,7 +3759,7 @@
 worked out how to generate such a descendent in the multi-ancestor case.
 
 
address@hidden monotone heads address@hidden
address@hidden mtn heads address@hidden
 This command lists the ``heads'' of @var{branchname}. 
 
 The ``heads'' of a branch is the set of revisions which are members of
@@ -3770,8 +3770,8 @@
 computer clocks is not reliable, so monotone usually ignores time.
 
 
address@hidden monotone merge address@hidden
address@hidden monotone merge --lca address@hidden
address@hidden mtn merge address@hidden
address@hidden mtn merge --lca address@hidden
 This command merges the ``heads'' of @var{branchname}, if there are
 multiple heads, and commits the results to the database, marking the
 resulting merged revision as a member of @var{branchname}. The merged
@@ -3792,8 +3792,8 @@
 rare, and until we can find something better than 3-way merging to use,
 you may find this option more convenient than @command{explicit_merge}
 
address@hidden monotone propagate @var{sourcebranch} @var{destbranch}
address@hidden monotone propagate --lca @var{sourcebranch} @var{destbranch}
address@hidden mtn propagate @var{sourcebranch} @var{destbranch}
address@hidden mtn propagate --lca @var{sourcebranch} @var{destbranch}
 This command takes a unique head from @var{sourcebranch} and merges it
 with a unique head of @var{destbranch}, using the least common
 ancestor of the two heads for a 3-way merge. The resulting revision is
@@ -3818,8 +3818,8 @@
 rare, and until we can find something better than 3-way merging to use,
 you may find this option more convenient than @command{explicit_merge}
 
address@hidden monotone explicit_merge @var{id} @var{id} @var{destbranch}
address@hidden monotone explicit_merge @var{id} @var{id} @var{ancestor} @var{destbranch}
address@hidden mtn explicit_merge @var{id} @var{id} @var{destbranch}
address@hidden mtn explicit_merge @var{id} @var{id} @var{ancestor} @var{destbranch}
 This command merges exactly the two @var{id}s you give it, and places
 the result in branch @var{destbranch}.  It is useful when you need more
 control over the merging process than @code{propagate} or @code{merge}
@@ -3830,7 +3830,7 @@
 @var{ancestor} argument is given, the merge uses that revision as the
 common ancestor instead of the default ancestor.
 
address@hidden monotone merge_into_dir @var{sourcebranch} @var{destbranch} @var{dir}
address@hidden mtn merge_into_dir @var{sourcebranch} @var{destbranch} @var{dir}
 This command takes a unique head from @var{sourcebranch} and merges it
 into a unique head of @var{destbranch}, as a directory. The resulting
 revision is committed to @var{destbranch}. If either @var{sourcebranch} or
@@ -3857,7 +3857,7 @@
 @section Workspace
 
 @ftable @command
address@hidden monotone setup address@hidden
address@hidden mtn setup address@hidden
 This command prepares @var{directory} as a monotone workspace,
 by creating and populating the @file{_MTN} directory with basic
 information.  This information must include at least the branch and the
@@ -3870,8 +3870,8 @@
 directory is used.
 
 
address@hidden monotone add @var{pathname...}
address@hidden monotone add --unknown
address@hidden mtn add @var{pathname...}
address@hidden mtn add --unknown
 This command places ``add'' entries for the paths specified in
 @var{pathname...} in the workspace's ``work list''. The work list
 of your workspace is located at @file{_MTN/work}, and is a list of
@@ -3889,8 +3889,8 @@
 any added entries inserted in its manifest.
 
 
address@hidden monotone [--execute] drop @var{pathname...}
address@hidden monotone drop --missing
address@hidden mtn [--execute] drop @var{pathname...}
address@hidden mtn drop --missing
 This command places ``drop'' entries for the paths specified in
 @var{pathname...} in the workspace's ``work list''. The work list of
 your workspace is located at @file{_MTN/work}, and is a list of
@@ -3917,8 +3917,8 @@
 deletion operations in the filesystem.  It will ignore files or
 directories which have already been deleted.
 
address@hidden monotone [--execute] rename @var{src} @var{dst}
address@hidden monotone [--execute] rename @var{src1} @var{...} @var{dst/}
address@hidden mtn [--execute] rename @var{src} @var{dst}
address@hidden mtn [--execute] rename @var{src1} @var{...} @var{dst/}
 This command places ``rename'' entries for the paths specified in
 @var{src} and @var{dst} in the workspace's ``work list''. The second form
 renames a number of source paths to the given destination. The work
@@ -3939,12 +3939,12 @@
 rename operations in the filesystem. It will ignore missing source files
 and will not overwrite existing destination files.
 
address@hidden monotone commit
address@hidden monotone commit address@hidden
address@hidden monotone commit address@hidden
address@hidden monotone commit @var{pathname...}
address@hidden monotone commit address@hidden @var{pathname...} 
address@hidden monotone commit address@hidden @var{pathname...} 
address@hidden mtn commit
address@hidden mtn commit address@hidden
address@hidden mtn commit address@hidden
address@hidden mtn commit @var{pathname...}
address@hidden mtn commit address@hidden @var{pathname...} 
address@hidden mtn commit address@hidden @var{pathname...} 
 
 This command looks at your workspace, decides which files have
 changed, and saves the changes to your database. It does this by loading
@@ -4018,8 +4018,8 @@
 and/or review your log message for the change.
 @end itemize
 
address@hidden monotone revert @var{pathname...}
address@hidden monotone revert --missing @var{pathname...}
address@hidden mtn revert @var{pathname...}
address@hidden mtn revert --missing @var{pathname...}
 This command changes your workspace, so that changes you have made
 since the last checkout or update are discarded. The command is
 restricted the set of files or directories given as arguments.  To
@@ -4032,8 +4032,8 @@
 deleted from the workspace.  Only missing files matching the given
 file or directory arguments are reverted.
 
address@hidden monotone update
address@hidden monotone update address@hidden
address@hidden mtn update
address@hidden mtn update address@hidden
 Without a @option{--revision} argument, this command incorporates
 ``recent'' changes found in your database into your workspace. It
 does this by performing 3 separate stages. If any of these stages
@@ -4072,14 +4072,14 @@
 becomes the new default branch of the workspace (even if you also
 specify an explicit @option{--revision} argument).
 
address@hidden monotone refresh_inodeprints
address@hidden mtn refresh_inodeprints
 This command puts the current workspace into @ref{Inodeprints} mode,
 if it was not already, and forces a full inodeprints cache refresh.
 After running this command, you are guaranteed that your workspace is
 in inodeprints mode, and that the inodeprints cache is accurate and up
 to date.
 
address@hidden monotone pivot_root [--execute] pivot_root @var{new_root} @var{put_old}
address@hidden mtn pivot_root [--execute] pivot_root @var{new_root} @var{put_old}
 Most users will never need this command.  It is primarily useful in
 certain tricky cases where one wishes to combine several projects
 into one, or split one project into several. See also @command{merge_into_dir}.
@@ -4115,10 +4115,10 @@
 @section Network
 
 @ftable @command
address@hidden monotone serve address@hidden:@var{port}]] @var{glob} [...] address@hidden
address@hidden monotone pull [--set-default] address@hidden:@var{port}] address@hidden [...] address@hidden
address@hidden monotone push [--set-default] address@hidden:@var{port}] address@hidden [...] address@hidden
address@hidden monotone sync [--set-default] address@hidden:@var{port}] address@hidden [...] address@hidden
address@hidden mtn serve address@hidden:@var{port}]] @var{glob} [...] address@hidden
address@hidden mtn pull [--set-default] address@hidden:@var{port}] address@hidden [...] address@hidden
address@hidden mtn push [--set-default] address@hidden:@var{port}] address@hidden [...] address@hidden
address@hidden mtn sync [--set-default] address@hidden:@var{port}] address@hidden [...] address@hidden
 
 These commands operate the ``netsync'' protocol built into
 monotone. This is a custom protocol for rapidly synchronizing two
@@ -4202,8 +4202,8 @@
 @section Informative
 
 @ftable @command
address@hidden monotone status
address@hidden monotone status @var{pathname...}
address@hidden mtn status
address@hidden mtn status @var{pathname...}
 
 This command prints a description of the ``status'' of your workspace.
 In particular, it prints:
@@ -4234,8 +4234,8 @@
 copy.  Specifying only the pathname "." will restrict @command{status}
 to files changed within the current subdirectory of the workspace.
 
address@hidden monotone log
address@hidden monotone log address@hidden address@hidden address@hidden [...]] [--brief] [--no-merges] [--no-files] [--diffs] address@hidden [...]]
address@hidden mtn log
address@hidden mtn log address@hidden address@hidden address@hidden [...]] [--brief] [--no-merges] [--no-files] [--diffs] address@hidden [...]]
 
 This command prints out a log, in reverse-ancestry order, of small
 history summaries.  Each summary contains author, date, changelog and
@@ -4270,8 +4270,8 @@
 If one or more files are given, the command will only log the revisions
 where those files are changed.
 
address@hidden monotone annotate @var{file}
address@hidden monotone annotate address@hidden [--brief] @var{file}
address@hidden mtn annotate @var{file}
address@hidden mtn annotate address@hidden [--brief] @var{file}
 
 Dumps an annotated copy of the file to stdout.  In the absence of the 
 @code{--brief} flag, each line of the file
@@ -4284,9 +4284,9 @@
 author cert value is truncated at the first @code{@@} or space
 character and the date field is truncated to remove the time of day.
 
address@hidden monotone complete file @var{partial-id}
address@hidden monotone complete [--brief] key @var{partial-id}
address@hidden monotone complete [--brief] revision @var{partial-id}
address@hidden mtn complete file @var{partial-id}
address@hidden mtn complete [--brief] key @var{partial-id}
address@hidden mtn complete [--brief] revision @var{partial-id}
 
 These commands print out all known completions of a partial @sc{sha1}
 value, listing completions which are @code{file}, @code{manifest} or
@@ -4321,14 +4321,14 @@
 @end group
 @end smallexample
 
address@hidden monotone diff
address@hidden monotone diff --context
address@hidden monotone diff --external address@hidden
address@hidden monotone diff @var{pathname...}
address@hidden monotone diff address@hidden
address@hidden monotone diff address@hidden @var{pathname...}
address@hidden monotone diff address@hidden address@hidden
address@hidden monotone diff address@hidden address@hidden @var{pathname...}
address@hidden mtn diff
address@hidden mtn diff --context
address@hidden mtn diff --external address@hidden
address@hidden mtn diff @var{pathname...}
address@hidden mtn diff address@hidden
address@hidden mtn diff address@hidden @var{pathname...}
address@hidden mtn diff address@hidden address@hidden
address@hidden mtn diff address@hidden address@hidden @var{pathname...}
 
 These commands print out GNU ``unified diff format'' textual difference
 listings between various manifest versions. With no @option{--revision}
@@ -4374,7 +4374,7 @@
 passed to it, and so on, are controlled by the hook
 @code{external_diff}; see @ref{Hooks} for more details.
 
address@hidden monotone list certs @var{id}
address@hidden mtn list certs @var{id}
 
 These commands will print out a list of certificates associated with
 a particular revision @var{id}. Each line of the print out will
@@ -4430,8 +4430,8 @@
 @end group
 @end smallexample
 
address@hidden monotone list keys
address@hidden monotone list keys @var{pattern}
address@hidden mtn list keys
address@hidden mtn list keys @var{pattern}
 These commands list @sc{rsa} keys held in your keystore and current database.
 They do not print out any cryptographic information; they simply list the
 names of public and private keys you have on hand.
@@ -4439,22 +4439,22 @@
 If @var{pattern} is provided, it is used as a glob to limit the keys
 listed. Otherwise all keys in your database are listed.
 
address@hidden monotone list branches
address@hidden mtn list branches
 
 This command lists all known branches in your database.
 
address@hidden monotone list tags
address@hidden mtn list tags
 
 This command lists all known tags in your database.
 
address@hidden monotone list vars
address@hidden monotone list vars @var{domain}
address@hidden mtn list vars
address@hidden mtn list vars @var{domain}
 
 This command lists all vars in your database, or all vars within a given
 @var{domain}.  See @ref{Vars} for more information.
 
address@hidden monotone list known
address@hidden monotone list known @var{pathname...}
address@hidden mtn list known
address@hidden mtn list known @var{pathname...}
 
 This command lists all files which would become part of the manifest of
 the next revision if you comitted your workspace at this point.
@@ -4468,8 +4468,8 @@
 Specifying only the pathname "." will restrict the search for known
 files to the current subdirectory of the workspace.
 
address@hidden monotone list unknown
address@hidden monotone list unknown @var{pathname...}
address@hidden mtn list unknown
address@hidden mtn list unknown @var{pathname...}
 
 This command lists all files in your workspace that monotone is 
 either ignoring or knows nothing about.
@@ -4483,8 +4483,8 @@
 Specifying only the pathname "." will restrict the search for unknown
 files to the current subdirectory of the workspace.
 
address@hidden monotone list ignored
address@hidden monotone list ignored @var{pathname...}
address@hidden mtn list ignored
address@hidden mtn list ignored @var{pathname...}
 
 This command lists all files in your workspace that monotone is
 intentionally ignoring, due to the results of the @code{ignore_file
@@ -4499,8 +4499,8 @@
 Specifying only the pathname "." will restrict the search for ignored
 files to the current subdirectory of the workspace.
 
address@hidden monotone list missing
address@hidden monotone list missing @var{pathname...}
address@hidden mtn list missing
address@hidden mtn list missing @var{pathname...}
 
 This command lists all files in your workspace's base manifest,
 which are not present in the workspace.
@@ -4514,8 +4514,8 @@
 Specifying only the pathname "." will restrict the search for missing
 files to the current subdirectory of the workspace.
 
address@hidden monotone list changed
address@hidden monotone list changed @var{pathname...}
address@hidden mtn list changed
address@hidden mtn list changed @var{pathname...}
 
 This command lists all files in your workspace that have changed
 compared to the base revision, including files that are dropped, added
@@ -4530,7 +4530,7 @@
 Specifying only the pathname "." will restrict the search for known
 files to the current subdirectory of the workspace.
 
address@hidden monotone show_conflicts @var{rev} @var{rev}
address@hidden mtn show_conflicts @var{rev} @var{rev}
 
 This command shows what conflicts would need to be resolved in order to merge
 the given revisions.
@@ -4542,7 +4542,7 @@
 @section Key and Cert
 
 @ftable @command
address@hidden monotone genkey @var{keyid}
address@hidden mtn genkey @var{keyid}
 
 This command generates an @sc{rsa} public/private key pair, using a
 system random number generator, and stores it in your keystore under
@@ -4559,27 +4559,27 @@
 increases the risk of a key compromise on your local computer. Be
 careful using this hook.
 
address@hidden monotone dropkey @var{keyid}
address@hidden mtn dropkey @var{keyid}
 
 This command drops the public and/or private key. If both exist, both
 are dropped, if only one exists, it is dropped. This command should
 be used with caution as changes are irreversible without a backup of
 the key(s) that were dropped.
 
address@hidden monotone chkeypass @var{id}
address@hidden mtn chkeypass @var{id}
 
 This command lets you change the passphrase of the private half of the
 key @var{id}.
 
address@hidden monotone cert @var{id} @var{certname} 
address@hidden monotone cert @var{id} @var{certname} @var{certval}
address@hidden mtn cert @var{id} @var{certname} 
address@hidden mtn cert @var{id} @var{certname} @var{certval}
 
 These commands create a new certificate with name @var{certname}, for
 a revision with version @var{id}. If @var{certval} is provided, it is
 the value of the certificate.  Otherwise the certificate value is read
 from @code{stdin}.
 
address@hidden monotone trusted @var{id} @var{certname} @var{certval} @var{signers}
address@hidden mtn trusted @var{id} @var{certname} @var{certval} @var{signers}
 
 This command lets you test your revision trust hook
 @code{get_revision_cert_trust} (see @ref{Hook Reference}).  You pass it
@@ -4597,7 +4597,7 @@
 @section Certificate
 
 @ftable @command
address@hidden monotone approve @var{id}
address@hidden mtn approve @var{id}
 
 This command is a synonym for @code{mtn cert @var{id} branch
 @var{branchname}} where @var{branchname} is the current branch name
@@ -4605,21 +4605,21 @@
 option).
 
 
address@hidden monotone comment @var{id}
address@hidden monotone comment @var{id} @var{comment}
address@hidden mtn comment @var{id}
address@hidden mtn comment @var{id} @var{comment}
 
 These commands are synonyms for @code{mtn cert @var{id}
 comment @var{comment}}. If @var{comment} is not provided, it is read
 from @code{stdin}.
 
 
address@hidden monotone tag @var{id} @var{tagname}
address@hidden mtn tag @var{id} @var{tagname}
 
 This command is a synonym for @code{mtn cert @var{id} tag
 @var{tagname}}.
 
address@hidden monotone testresult @var{id} 0
address@hidden monotone testresult @var{id} 1
address@hidden mtn testresult @var{id} 0
address@hidden mtn testresult @var{id} 1
 
 These commands are synonyms for @code{mtn cert @var{id}
 testresult 0} or @code{mtn cert @var{id} testresult 1}.
@@ -4647,15 +4647,15 @@
 data items around manually.
 
 @ftable @command
address@hidden monotone 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 monotone automate packet_for_fdata @var{id}
address@hidden monotone 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
@@ -4663,7 +4663,7 @@
 between monotone databases.  See @ref{Automation} for details of these
 commands.
 
address@hidden monotone 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.
@@ -4671,16 +4671,16 @@
 monotone databases.  See @ref{Automation} for details of this
 command.
 
address@hidden monotone privkey @var{keyid}
address@hidden monotone pubkey @var{keyid}
address@hidden mtn privkey @var{keyid}
address@hidden mtn pubkey @var{keyid}
 
 These commands print out an @code{keypair} or @code{pubkey} packet for
 the @sc{rsa} key @var{keyid}. These can be used to transport public or
 private keys safely between monotone databases.
 
 
address@hidden monotone read
address@hidden monotone read @var{file1} @var{file2...}
address@hidden mtn read
address@hidden mtn read @var{file1} @var{file2...}
 
 This command reads packets from files or @code{stdin} and stores them
 in your database.
@@ -4693,21 +4693,21 @@
 @section Database
 
 @ftable @command
address@hidden monotone set @var{domain} @var{name} @var{value}
address@hidden mtn set @var{domain} @var{name} @var{value}
 
 Associates the value @var{value} to @var{name} in domain @var{domain}.
 See @ref{Vars} for more information.
 
address@hidden monotone unset @var{domain} @var{name}
address@hidden mtn unset @var{domain} @var{name}
 
 Deletes any value associated with @var{name} in @var{domain}.  See
 @ref{Vars} for more information.
 
address@hidden monotone db init address@hidden 
address@hidden mtn db init address@hidden 
 
 This command initializes a new monotone database at @file{dbfile}.
 
address@hidden monotone db rebuild address@hidden 
address@hidden mtn db rebuild address@hidden 
 
 This command rebuilds the ancestry graph of the monotone database at
 @file{dbfile}, which may become necessary if future bugs in monotone
@@ -4719,17 +4719,17 @@
 incompatible with that of anyone else working on the same project!  Read
 @ref{Rebuilding ancestry}.
 
address@hidden monotone db info address@hidden 
address@hidden mtn db info address@hidden 
 
 This command prints information about the monotone database @file{dbfile},
 including its schema version and various table size statistics.
 
address@hidden monotone db version address@hidden 
address@hidden mtn db version address@hidden 
 
 This command prints out just the schema version of the monotone
 database @file{dbfile}.
 
address@hidden monotone db dump address@hidden 
address@hidden mtn db dump address@hidden 
 
 This command dumps an SQL statement representing the entire state of
 @file{dbfile} to the standard output stream. It is a very low-level
@@ -4737,7 +4737,7 @@
 possible. It is sometimes also useful when migrating databases between
 variants of the underlying sqlite database format.
 
address@hidden monotone db load address@hidden 
address@hidden mtn db load address@hidden 
 
 This command applies a raw SQL statement, read from the standard input
 stream, to the database @file{dbfile}. It is most useful when loading
@@ -4747,7 +4747,7 @@
 database is @emph{included} in the dump, so you should not try to
 @command{init} your database before a @command{load}.
 
address@hidden monotone db migrate address@hidden 
address@hidden mtn db migrate address@hidden 
 
 This command attempts to migrate the database @file{dbfile} to the
 newest schema known by the version of monotone you are currently
@@ -4758,7 +4758,7 @@
 a copy of it before migrating, in case there is an untrapped error
 during migration.
 
address@hidden monotone db check address@hidden 
address@hidden mtn db check address@hidden 
 
 Monotone always works hard to verify the data it creates and accesses.
 For instance, if you have hard drive problems that corrupt data in
@@ -4890,7 +4890,7 @@
 This command also verifies that the @sc{sha1} hash of every file, manifest,
 and revision is correct.
 
address@hidden monotone db kill_rev_locally @var{id}
address@hidden mtn db kill_rev_locally @var{id}
 
 This command ``kills'', i.e., deletes, a given revision, as well as any
 certs attached to it.  It has an ugly name because it is a dangerous
@@ -4921,7 +4921,7 @@
 work you can extract @var{id}'s data.
 @end itemize
 
address@hidden monotone db kill_branch_certs_locally @var{branch}
address@hidden mtn db kill_branch_certs_locally @var{branch}
 
 This command ``kills'' a branch by deleting all branch certs with that
 branch name. You should consider carefully whether you want to use it,
@@ -4936,7 +4936,7 @@
 you sync, unless the owners of those databases also delete those
 certificates locally.
 
address@hidden monotone db kill_tag_locally @var{tag}
address@hidden mtn db kill_tag_locally @var{tag}
 
 This command ``kills'' a tag by deleting all tag certs with that tag
 name. You should consider carefully whether you want to use it, because
@@ -4949,7 +4949,7 @@
 sync, unless the owners of those databases also delete those
 certificates locally.
 
address@hidden monotone db execute @var{sql-statement}
address@hidden mtn db execute @var{sql-statement}
 
 This is a debugging command which executes @var{sql-statement} against
 your database, and prints any results of the expression in a tabular
@@ -4970,7 +4970,7 @@
 
 
 @ftable @command
address@hidden monotone automate interface_version
address@hidden mtn automate interface_version
 
 @table @strong
 @item Arguments:
@@ -5007,7 +5007,7 @@
 @end table
 
 
address@hidden monotone automate heads address@hidden
address@hidden mtn automate heads address@hidden
 
 @table @strong
 @item Arguments:
@@ -5042,7 +5042,7 @@
 @end table
 
 
address@hidden monotone automate ancestors @var{rev1} address@hidden [...]]
address@hidden mtn automate ancestors @var{rev1} address@hidden [...]]
 
 @table @strong
 @item Arguments:
@@ -5083,7 +5083,7 @@
 @end table
 
 
address@hidden monotone automate parents @var{rev}
address@hidden mtn automate parents @var{rev}
 
 @table @strong
 @item Arguments:
@@ -5121,7 +5121,7 @@
 @end table
 
 
address@hidden monotone automate descendents @var{rev1} address@hidden [...]]
address@hidden mtn automate descendents @var{rev1} address@hidden [...]]
 
 @table @strong
 @item Arguments:
@@ -5162,7 +5162,7 @@
 @end table
 
 
address@hidden monotone automate children @var{rev}
address@hidden mtn automate children @var{rev}
 
 @table @strong
 @item Arguments:
@@ -5200,7 +5200,7 @@
 @end table
 
 
address@hidden monotone automate graph
address@hidden mtn automate graph
 
 @table @strong
 @item Arguments:
@@ -5245,7 +5245,7 @@
 @end table
 
 
address@hidden monotone automate erase_ancestors address@hidden address@hidden [...]]]
address@hidden mtn automate erase_ancestors address@hidden address@hidden [...]]]
 
 @table @strong
 @item Arguments:
@@ -5287,7 +5287,7 @@
 @end table
 
 
address@hidden monotone automate toposort address@hidden address@hidden [...]]]
address@hidden mtn automate toposort address@hidden address@hidden [...]]]
 
 @table @strong
 @item Arguments:
@@ -5327,7 +5327,7 @@
 @end table
 
 
address@hidden monotone 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:
@@ -5372,7 +5372,7 @@
 @end table
 
 
address@hidden monotone automate leaves
address@hidden mtn automate leaves
 
 @table @strong
 @item Arguments:
@@ -5412,7 +5412,7 @@
 @end table
 
 
address@hidden monotone automate select @var{selector}
address@hidden mtn automate select @var{selector}
 
 @table @strong
 @item Arguments:
@@ -5447,7 +5447,7 @@
 
 @end table
 
address@hidden monotone automate inventory
address@hidden mtn automate inventory
 
 @table @strong
 @item Arguments:
@@ -5682,7 +5682,7 @@
 
 @end table
 
address@hidden monotone automate certs @var{id}
address@hidden mtn automate certs @var{id}
 
 @table @strong
 @item Arguments:
@@ -5763,7 +5763,7 @@
 
 @end table
 
address@hidden monotone automate stdio
address@hidden mtn automate stdio
 
 @table @strong
 @item Arguments:
@@ -5833,8 +5833,8 @@
 
 @end table
 
address@hidden monotone automate get_revision
address@hidden monotone automate get_revision @var{id}
address@hidden mtn automate get_revision
address@hidden mtn automate get_revision @var{id}
 
 @table @strong
 @item Arguments:
@@ -5937,8 +5937,8 @@
 
 @end table
 
address@hidden monotone automate get_manifest_of
address@hidden monotone automate get_manifest_of @var{revid}
address@hidden mtn automate get_manifest_of
address@hidden mtn automate get_manifest_of @var{revid}
 
 @table @strong
 @item Arguments:
@@ -6082,7 +6082,7 @@
 
 @end table
 
address@hidden monotone automate get_file @var{id}
address@hidden mtn automate get_file @var{id}
 
 @table @strong
 @item Arguments:
@@ -6119,7 +6119,7 @@
 @end table
 
 
address@hidden monotone automate keys
address@hidden mtn automate keys
 
 @table @strong
 @item Arguments:
@@ -6168,7 +6168,7 @@
 
 @end table
 
address@hidden monotone automate packet_for_rdata @var{id}
address@hidden mtn automate packet_for_rdata @var{id}
 
 @table @strong
 @item Arguments:
@@ -6207,7 +6207,7 @@
 
 @end table
 
address@hidden monotone automate packet_for_certs @var{id}
address@hidden mtn automate packet_for_certs @var{id}
 
 @table @strong
 @item Arguments:
@@ -6272,7 +6272,7 @@
 
 @end table
 
address@hidden monotone automate packet_for_fdata @var{id}
address@hidden mtn automate packet_for_fdata @var{id}
 
 @table @strong
 @item Arguments:
@@ -6309,7 +6309,7 @@
 
 @end table
 
address@hidden monotone 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:
@@ -6355,7 +6355,7 @@
 @section RCS
 
 @ftable @command
address@hidden monotone 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
@@ -6363,7 +6363,7 @@
 database.  Note that this does not do any revision reconstruction, and
 is only useful for debugging.
 
address@hidden monotone cvs_import @var{pathname}
address@hidden mtn cvs_import @var{pathname}
 
 This command imports all the file versions in each RCS file found in the
 tree of files starting at @var{pathname}, then reconstructs the