# 
# 
# patch "monotone.texi"
#  from [772b9fe57ac95f33d6637e13030a2adb74d095d0]
#    to [4d32e36fb02b2bbc65eca59ae302c4d1eadadaca]
# 
============================================================
--- monotone.texi	772b9fe57ac95f33d6637e13030a2adb74d095d0
+++ monotone.texi	4d32e36fb02b2bbc65eca59ae302c4d1eadadaca
@@ -4681,11 +4681,10 @@
 @code{get_encloser_pattern}; @ref{Hooks}.
 
 
address@hidden requests the ``unified diff'' format, the default
-.  @option{--context}
-request the ``context diff'' format (analogous to running the program
address@hidden -c}).  Both of these formats are generated directly by
-monotone, using its built-in diff algorithm.
address@hidden requests the ``unified diff'' format, the default.
address@hidden requests the ``context diff'' format (analogous to
+running the program @code{diff -c}).  Both of these formats are
+generated directly by monotone, using its built-in diff algorithm.
 
 Sometimes, you may want more flexibility in output formats; for these
 cases, you can use @option{--external}, which causes monotone to invoke
@@ -7543,10 +7542,13 @@
 @option{--show-encloser} option (and @emph{not} 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 Lua-format regular expression; this regular expression
+containing a regular expression; this regular expression
 will be used to find lines that, in that file, name the ``top-level''
 constructs enclosing each ``hunk'' of changes.  The default is
address@hidden, which is correct for many programming languages.
address@hidden:alnum:]$_]}, which is correct for many programming
+languages.  If you have a better regular expression for some
+language, you can add it here; and if you send it to the monotone
+developers, we will likely make it to the default for that language.
 
 @item external_diff (@var{file_path}, @var{old_data}, @var{new_data}, @var{is_binary},
                      @var{diff_args}, @var{old_rev}, @var{new_rev})