#
#
# patch "monotone.texi"
#  from [80457540a0a71d8a71a9b00644ed24dcd950e109]
#    to [b0b91b812576f51692368748e607c741f4d9ac1e]
# 
# patch "std_hooks.lua"
#  from [9fe85754c15306b39ba5140045b33684ad7b0f10]
#    to [8387cf48fecdb5dcee93be8b9b01e68bb32660a1]
#
============================================================
--- monotone.texi	80457540a0a71d8a71a9b00644ed24dcd950e109
+++ monotone.texi	b0b91b812576f51692368748e607c741f4d9ac1e
@@ -8535,12 +8535,12 @@ @subsection Attribute Handling
 platform-specific attributes, such as permission bits, access control
 lists, or special file types.
 
-By default, there is only one entry in this table, for the @code{execute}
+By default, there is only one entry in this table, for the @code{mtn:execute}
 attribute. Its definition is:
 
 @smallexample
 @group
-attr_functions["execute"] = 
+attr_functions["mtn:execute"] = 
   function(filename, value) 
         if (value == "true") then
          make_executable(filename)
@@ -8559,22 +8559,23 @@ @subsection Attribute Handling
 hook functions is called once for each file during an @dfn{add}.
 
 By default, there are only two entries in this table, for the
address@hidden and @code{manual_merge} attributes. Their definition is:
address@hidden:execute} and @code{mtn:manual_merge} attributes. Their
+definition is:
 
 @smallexample
 @group
-attr_init_functions["execute"] = 
+attr_init_functions["mtn:execute"] = 
    function(filename)
       if (is_executable(filename)) then 
         return "true" 
       else 
         return nil 
-        end
-  end
-attr_init_functions["manual_merge"] = 
+      end
+   end
+attr_init_functions["mtn:manual_merge"] = 
    function(filename)
       if (binary_file(filename)) then 
-        return "true" -- binary files must merged manually
+        return "true" -- binary files must be merged manually
       else 
         return nil
       end 
============================================================
--- std_hooks.lua	9fe85754c15306b39ba5140045b33684ad7b0f10
+++ std_hooks.lua	8387cf48fecdb5dcee93be8b9b01e68bb32660a1
@@ -66,7 +66,7 @@ attr_init_functions["mtn:manual_merge"] 
 attr_init_functions["mtn:manual_merge"] = 
    function(filename)
       if (binary_file(filename)) then 
-        return "true" -- binary files must merged manually
+        return "true" -- binary files must be merged manually
       else 
         return nil
       end