#
#
# patch "monotone.texi"
#  from [55c34365c18b828bd4f6e0af1e4088a30493e88c]
#    to [f5b973cf362448743205a8304fce5cb66dd09496]
#
============================================================
--- monotone.texi	55c34365c18b828bd4f6e0af1e4088a30493e88c
+++ monotone.texi	f5b973cf362448743205a8304fce5cb66dd09496
@@ -5424,8 +5424,8 @@ @section Network
 @item mtn serve address@hidden:@var{port}]]
 @item mtn serve --stdio [--no-transport-auth]
 @itemx mtn pull [--set-default] address@hidden address@hidden [...] address@hidden
address@hidden mtn push [--set-default] address@hidden address@hidden [...] address@hidden
address@hidden mtn sync [--set-default] address@hidden address@hidden [...] address@hidden
address@hidden mtn push [--set-default] address@hidden address@hidden address@hidden [...] address@hidden
address@hidden mtn sync [--set-default] address@hidden address@hidden address@hidden [...] address@hidden
 
 These commands operate the ``netsync'' protocol built into
 monotone. This is a custom protocol for rapidly synchronizing two
@@ -8121,6 +8121,94 @@ @section Automation
 
 @end table
 
+
address@hidden mtn automate pull [--set-default] address@hidden address@hidden [...] address@hidden
address@hidden mtn automate push [--set-default] address@hidden address@hidden address@hidden [...] address@hidden
address@hidden mtn automate sync [--set-default] address@hidden address@hidden address@hidden [...] address@hidden
+
address@hidden @strong
address@hidden Arguments:
+
+The automate versions of pull, push and sync have the same set of arguments and
+options compared to the non-automate versions. Please check this manual in the
+appropriate section for a full explanation.
+
address@hidden Added in:
+
+FIXME
+
address@hidden Purpose:
+
+Pushes, pulls or syncs (push & pull) revisions, certificates and keys of
+the given database to, from or with the given netsync server.
+
address@hidden Sample output (stdio):
+
+The following output shows an example of a pull which transferred two revisions
+and eight certs.
+
address@hidden:} The linebreaks are not part of the actual format, but have been
+added for better readability.
+
address@hidden
+0:p:62:doing anonymous pull; use -kKEYNAME if you need authentication
+0:p:25:connecting to monotone.ca0:0:p:29:finding items to synchronize:
+0:t:34:c:certificates;k:keys;r:revisions;
+0:t:12:c=0;k=0;r=0;
+0:t:13:c#0;k#0;r#64;
+0:t:14:c#0;k#0;r#128;
+[...]
+0:t:6:c;k;r;
+0:t:44:>:bytes in;<:bytes out;c:certs in;r:revs in;
+0:t:16:>=0;<=0;c=0;r=0;
+0:t:21:>#420;<#1344;c#0;r#0;
+0:t:22:>#1165;<#1741;c#0;r#0;
+[...]
+0:t:24:>#20839;<#14882;c#0;r#1;
+0:t:24:>#20839;<#14882;c#3;r#1;
+0:t:24:>#20839;<#14882;c#4;r#2;
+0:t:24:>#20839;<#14882;c#6;r#2;
+0:t:24:>#20863;<#14930;c#8;r#2;
+0:t:8:<;>;c;r;
+0:p:36:successful exchange with monotone.ca
+0:l:1:0
address@hidden verbatim
+
address@hidden Output format:
+
+If ran outside of @command{automate stdio}, the output of these commands is
+equal to the normal netsync command output.
+
+If these commands are run over stdio, the stdio ticker format is used
+(for a description of this format, check @command{automate stdio}).
+
+The following ticker types are printed out during the refinement phase:
+
address@hidden
address@hidden @code{c}: The number of certs found for an upcoming synchronization
address@hidden @code{k}: The number of keys found for an upcoming synchronization
address@hidden @code{r}: The number of revisions found for an upcoming synchronization
address@hidden itemize
+
+After refinement the actual synchronization between the two nodes start. The
+ticker stanzas in this phase are the following:
+
address@hidden
address@hidden @code{>}: The number of incoming bytes
address@hidden @code{<}: The number of outgoing bytes
address@hidden @code{c}: The number of incoming certs  (only pull and sync)
address@hidden @code{C}: The number of outgoing certs  (only push and sync)
address@hidden @code{r}: The number of incoming revisions  (only pull and sync)
address@hidden @code{R}: The number of outgoing revisions  (only push and sync)
address@hidden itemize
+
address@hidden Error conditions:
+
+If a netsync error occurs, the command outputs an error and exits with status 1.
+
address@hidden table
+
+
 @item mtn automate genkey @var{name} @var{passphrase}
 
 @table @strong