# 
# patch "ChangeLog"
#  from [a3d59021b8c6a2c54967567427d87bbdcaa3b3ce]
#    to [65dc35836b5fad8f9b74318140e191b4e644447e]
# 
# patch "monotone.texi"
#  from [13afae574548710dd1067c2b525b3f76b2e9da44]
#    to [15985641e4896b703d700a1618478a0f63cbbf4f]
# 
========================================================================
--- ChangeLog	a3d59021b8c6a2c54967567427d87bbdcaa3b3ce
+++ ChangeLog	65dc35836b5fad8f9b74318140e191b4e644447e
@@ -1,3 +1,7 @@
+2005-08-23  Matthew Gregan  <address@hidden>
+
+	* monotone.texi: Bring 'update' syntax up to date.
+
 2005-08-23  Nathaniel Smith  <address@hidden>
 
 	* tests/t_diff_external.at: --diff-args without --external is an
========================================================================
--- monotone.texi	13afae574548710dd1067c2b525b3f76b2e9da44
+++ monotone.texi	15985641e4896b703d700a1618478a0f63cbbf4f
@@ -3102,8 +3102,8 @@
 @tab
 @smallexample
 @group
-$ monotone update 830ac1a5f033825ab364f911608ec294fe37f7bc
-$ monotone update t:FOO_TAG
+$ monotone update -r 830ac1a5f033825ab364f911608ec294fe37f7bc
+$ monotone update -r t:FOO_TAG
 @end group
 @end smallexample
 @end multitable
@@ -3613,11 +3613,11 @@
 files is reverted.}
 
 @item monotone update
address@hidden monotone update @var{revision}
-Without a @var{revision} argument, this command incorporates ``recent''
-changes found in your database into your working copy. It does this by
-performing 3 separate stages. If any of these stages fails, the update
-aborts, doing nothing. The stages are:
address@hidden monotone update address@hidden
+Without a @option{--revision} argument, this command incorporates
+``recent'' changes found in your database into your working copy. It
+does this by performing 3 separate stages. If any of these stages
+fails, the update aborts, doing nothing. The stages are:
 
 @itemize
 @item
@@ -3634,13 +3634,13 @@
 copy.
 @end itemize
 
-With an explicit @var{revision} argument, the command uses that revision
+With an explicit @option{--revision} argument, the command uses that revision
 as the update target instead of finding an acceptable candidate.
 
 The effect is always to take whatever changes you have made in the
 working copy, and to ``transpose'' them onto a new revision, using
 monotone's 3-way merge algorithm to achieve good results.  Note that
-with the explicit @var{revision} argument, it is possible to update
+with the explicit @option{--revision} argument, it is possible to update
 ``backwards'' or ``sideways'' in history --- for example, reverting to
 an earlier revision, or if your branch has two heads, updating to the
 other.  In all cases, the end result will be whatever revision you
@@ -3650,7 +3650,7 @@
 If a @option{--branch} option is specified, the @command{update} command
 tries to select the revision to update to from this branch.  The branch
 becomes the new default branch of the working copy (even if you also
-specify an explicit @var{revision} argument).
+specify an explicit @option{--revision} argument).
 
 @item monotone refresh_inodeprints
 This command puts the current working copy into @ref{Inodeprints} mode,
@@ -6800,7 +6800,7 @@
 specify either of them at all.
 @comment TROFF INPUT: .TP
 
address@hidden @b{update} @i{[revision]}
address@hidden @b{update} @i{[--revision=revision]}
 Update working copy.
 @comment TROFF INPUT: .SH DESCRIPTION