#
#
# patch "NEWS"
#  from [43d95a05bca2dd239e374b0af58dba9ed5883fbc]
#    to [6d6fea344c2a6c755e107e408307c03788e1b76f]
# 
# patch "monotone.texi"
#  from [0209ff76041fd586bcefef9534057ab7134976c8]
#    to [283cadca7e872ad6685c9247959ac059e231d358]
#
============================================================
--- NEWS	43d95a05bca2dd239e374b0af58dba9ed5883fbc
+++ NEWS	6d6fea344c2a6c755e107e408307c03788e1b76f
@@ -23,8 +23,19 @@
         - Two new commands to set and drop attributes over automate:
           `automate set_attribute` and `automate drop_attribute`
 
+        - There is a new function available to the lua hooks,
+          'server_request_sync(what, address, include, exclude)', which will
+          initate a netsync connection to the server at "address", with the
+          given include and exclude patterns, and will sync, push, or pull,
+          as given in the "what" argument. If called from a monotone instance
+          which is not acting as a server, this function will do nothing.
+
         Other
 
+        - Giving the --confdir argument will automatically set the key store
+          directory to keys/ under that directory, unless --keydir is also
+          given. This is a bugfix.
+
         Internal
 
         - Commands are now defined as a tree of commands instead of a
============================================================
--- monotone.texi	0209ff76041fd586bcefef9534057ab7134976c8
+++ monotone.texi	283cadca7e872ad6685c9247959ac059e231d358
@@ -8907,6 +8907,15 @@ @section Additional Lua Functions
 Returns true if a match for @var{regexp} is found in @var{str}, return
 false otherwise.
 
address@hidden server_request_sync(@var{what}, @var{address}, @var{include}, @var{exclude})
+
+Initiate a netsync connection to the server at @var{address}, with the
+given include and exclude patterns, of type @option{sync}, @option{push},
+or @option{pull}, as given by the @var{what} argument.
+
+When called by a monotone instance which is not running the @option{serve}
+command, this function has no effect.
+
 @item sleep(@var{seconds})
 
 Makes the calling process sleep for the specified number of seconds.