# 
# patch "ChangeLog"
#  from [4d91795bd669f843a4aee394c069e3f86b36d4c5]
#    to [00da8e51237cf7b4b675b5a3923ae01de7f2e41e]
# 
# patch "monotone.texi"
#  from [547ea280134218686da0bec122c493465705e43c]
#    to [e531baf707ae182b4cda0442bb875a1c48bc9970]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,11 @@
 2005-05-21  Richard Levitte  <address@hidden>
 
+	* monotone.texi: Add a note about the --brief option with
+	'monotone log', and restructure the synopsis since it was getting
+	a bit silly with all possible variants.
+
+2005-05-21  Richard Levitte  <address@hidden>
+
 	* commands.cc (log_certs): Add two arguments; a separator string
 	to be used in front of the second to last cert for multi-valued
 	cert types, a bool to say if each cert should be ended with a
--- monotone.texi
+++ monotone.texi
@@ -3673,21 +3673,26 @@
 to files changed within the current subdirectory of the working copy.
 
 @item monotone log
address@hidden monotone log address@hidden
address@hidden monotone log address@hidden
address@hidden monotone log address@hidden address@hidden address@hidden [...]]
address@hidden monotone log address@hidden @var{file}
address@hidden monotone log address@hidden address@hidden address@hidden [...]] @var{file}
address@hidden monotone log address@hidden address@hidden [...]] [--brief] address@hidden [...]]
 
-This command prints out a log, in reverse-ancestry order, of small history
-summaries.  Each summary contains author, date, changelog and comment
-information associated with a revision.  If @var{n} is given, at most that
-many log entries will be given.  If one or more revision IDs are given,
-the command starts tracing back through history from these revisions,
-otherwise it starts from the base revision of your working copy.
+This command prints out a log, in reverse-ancestry order, of small
+history summaries.  Each summary contains author, date, changelog and
+comment information associated with a revision.  If @code{--brief} is
+given, the output consists of one line per revision with the revision
+ID, the author, the date and the branches (separated with commas).
 
+If @address@hidden is given, at most that many log entries will be
+given.
+
+If one or more revision IDs are given, the command starts tracing back
+through history from these revisions, otherwise it starts from the base
+revision of your working copy.
+
+If one or more files are given, the command will only log the revisions
+where those files are changed.
+
 @item monotone annotate @var{file}
address@hidden monotone annotate address@hidden @var{file}
address@hidden monotone annotate address@hidden @var{file}
 
 Dumps an annotated copy of the file to stdout.  Each line of the file
 is translated to <revision id>: <line> in the output, where <revision id>