#
#
# patch "NEWS"
#  from [f35be225a248b0365a615ae2cb7ebf9e670ec5c7]
#    to [8151b0ff99bda07284bf244172d91d0c610b012e]
# 
# patch "monotone.texi"
#  from [052708a573fa282057916ea145b1b4df34c22e3c]
#    to [b82536020ad6f27a0b0d2631a6d841c16e66817e]
#
============================================================
--- NEWS	f35be225a248b0365a615ae2cb7ebf9e670ec5c7
+++ NEWS	8151b0ff99bda07284bf244172d91d0c610b012e
@@ -70,9 +70,13 @@ Xxx Xxx 99 99:99:99 UTC 2010
 
         New Features
 
-        - the 'disapprove' command now accepts a revision range in
+        - The 'disapprove' command now accepts a revision range in
           addition to a single revision.
 
+        - The commands 'diff', 'fdiff' and 'log' now accept the new
+          '--colorize' option and render colored diffs if terminals which
+          support that.
+
         - New automation command 'log' which behaves identical to the
           normal 'log' command, except that it only outputs the
           revision ids.
============================================================
--- monotone.texi	052708a573fa282057916ea145b1b4df34c22e3c
+++ monotone.texi	b82536020ad6f27a0b0d2631a6d841c16e66817e
@@ -5814,7 +5814,7 @@ @section Informative
 changed within the current subdirectory of the workspace.
 
 @item mtn log
address@hidden mtn log address@hidden address@hidden address@hidden [...]] address@hidden [...]] address@hidden [...]] [--brief] [--no-merges] [--no-files] [--no-graph] [--diffs] address@hidden
address@hidden mtn log address@hidden address@hidden address@hidden [...]] address@hidden [...]] address@hidden [...]] [--brief] [--no-merges] [--no-files] [--no-graph] [--diffs] [--colorize] address@hidden
 
 This command prints out a log, in forward ancestry order by default
 but optionally in reverse ancestry order, of small history summaries.
@@ -5880,7 +5880,9 @@ @section Informative
 prefix on log output lines.
 
 Specifying @option{--diffs} causes the log output to include a unified
-diff of the changes in each revision.
+diff of the changes in each revision.  If @option{--colorize} is given
+additionally, the diff output is colored if the underlying terminal
+supports that.
 
 If one or more files are given, the command will only log the revisions
 where those files are changed.
@@ -5935,7 +5937,7 @@ @section Informative
 @end group
 @end smallexample
 
address@hidden mtn diff [--unified] [--no-show-encloser]
address@hidden mtn diff [--unified] [--no-show-encloser] [--colorize]
 @itemx mtn diff --context [--no-show-encloser]
 @itemx mtn diff --external address@hidden
 @itemx mtn diff @var{pathname...}
@@ -5976,21 +5978,19 @@ @section Informative
 changed within the current subdirectory of the workspace.
 
 The output format of @command{diff} is controlled by the options
address@hidden, @option{--context}, @option{--no-show-encloser}, and
address@hidden  By default, monotone uses its built-in diff
-algorithm to produce a listing in ``unified diff'' format (analogous
-to running the program @command{diff @option{-u}}); you can also explicitly
-request this with @option{--unified}.  The built-in diff algorithm can
-also produce ``context diff'' format (analogous to @command{diff @option{-c}}),
-which you request by specifying @option{--context}.  The short options
-that @command{diff} accepts for these modes, @option{-u} and
address@hidden, also work.
address@hidden, @option{--context}, @option{--no-show-encloser}, 
address@hidden, and @option{--external}.  By default, monotone uses 
+its built-in diff algorithm to produce a listing in ``unified diff'' format
+(analogous to running the program @command{diff @option{-u}}); you can also
+explicitly request this with @option{--unified}.  The built-in diff
+algorithm can also produce ``context diff'' format (analogous to 
address@hidden @option{-c}}), which you request by specifying 
address@hidden  The short options that @command{diff} accepts for these
+modes, @option{-u} and @option{-c}, also work.
 
 In either of these modes, monotone prints the name of the top-level code
 construct that encloses each ``hunk'' of changes, unless suppressed with
-the @option{--no-show-encloser}.  The options that
address@hidden accepts for this mode, @option{-p} and
address@hidden, also work.  Monotone finds the enclosing
+the @option{--no-show-encloser}.  Monotone finds the enclosing
 construct by scanning backward from the first changed line in each
 hunk for a line that matches a regular expression.  The default
 regular expression is correct for many programming languages.  You can
@@ -5998,6 +5998,10 @@ @section Informative
 @code{get_encloser_pattern}; @ref{Hooks}.  For the regular expression
 syntax, @xref{Regexps}.
 
+Furthermore, when @option{--colorize} is given, monotone tries to print 
+colored diff output if the underlying terminal supports it.  This works
+in both modes as well.
+
 @option{--unified} requests the ``unified diff'' format, the default.
 @option{--context} requests the ``context diff'' format (analogous to
 running the program @command{diff @option{-c}}).  Both of these formats are