#
#
# patch "monotone.texi"
#  from [1c69ee7de1e387682896b2ca36e883bc135179aa]
#    to [58cb4750bfad67386062a81a84c7b5f2e7f58255]
#
============================================================
--- monotone.texi	1c69ee7de1e387682896b2ca36e883bc135179aa
+++ monotone.texi	58cb4750bfad67386062a81a84c7b5f2e7f58255
@@ -5159,8 +5159,8 @@ @section Informative
 @end group
 @end smallexample
 
address@hidden mtn diff [--unified] [--show-encloser]
address@hidden mtn diff --context [--show-encloser]
address@hidden mtn diff [--unified] [--no-show-encloser]
address@hidden mtn diff --context [--no-show-encloser]
 @itemx mtn diff --external address@hidden
 @itemx mtn diff @var{pathname...}
 @itemx mtn diff address@hidden
@@ -5196,7 +5196,7 @@ @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{--show-encloser}, and
address@hidden, @option{--context}, @option{--no-show-encloser}, 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
@@ -5206,9 +5206,9 @@ @section Informative
 that @command{diff} accepts for these modes, @option{-u} and
 @option{-c}, also work.
 
-In either of these modes, you can request that monotone print the name
-of the top-level code construct that encloses each ``hunk'' of
-changes, with @option{--show-encloser}.  The options that
+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
 @command{diff} accepts for this mode, @option{-p} and
 @option{--show-c-function}, also work.  Monotone finds the enclosing
 construct by scanning backward from the first changed line in each
@@ -9289,8 +9289,8 @@ @subsection External Diff Tools
 @ftable @code
 @item get_encloser_pattern (@var{file_path})
 
-Called for each file when @command{diff} is given the
address@hidden option (and @emph{not} the
+Called for each file unless @command{diff} is given the
address@hidden option (or the
 @option{--external} option).  @var{file_path} is the pathname of the
 file that is being diffed.  The hook should return a string constant
 containing a regular expression; this regular expression will be used
@@ -11068,8 +11068,8 @@ @section Regular Expression Syntax
 
 Monotone expects user-provided regular expressions in
 @file{.mtn-ignore} files and as the result of the
address@hidden Lua hook (for the @option{--show-encloser}
-option to @command{diff}).  User-written Lua hooks may also use the
address@hidden Lua hook (for the @command{diff} command).
+User-written Lua hooks may also use the
 function @code{regex.search} as they see fit.  All these regular
 expressions should be written with the same syntax, which is that
 expected by the Perl-Compatible Regular Expression library (PCRE).