#
#
# patch "NEWS"
#  from [6d6fea344c2a6c755e107e408307c03788e1b76f]
#    to [fad53fb6fd29dcc661fc507f9c33f4b41cbfba3b]
# 
# patch "monotone.texi"
#  from [283cadca7e872ad6685c9247959ac059e231d358]
#    to [07d5b5af7b2c2af335d21f0b04c1682d438a019e]
#
============================================================
--- NEWS	6d6fea344c2a6c755e107e408307c03788e1b76f
+++ NEWS	fad53fb6fd29dcc661fc507f9c33f4b41cbfba3b
@@ -30,6 +30,12 @@
           as given in the "what" argument. If called from a monotone instance
           which is not acting as a server, this function will do nothing.
 
+        - There is a new hook available,
+          'get_netsync_key(server, include, exclude)', which is called to
+          determine which key to use for netsync operations. Note that the
+          server calls this once at startup with the address it is listening
+          on, "*", and "" as arguments, rather than for each connection.
+
         Other
 
         - Giving the --confdir argument will automatically set the key store
============================================================
--- monotone.texi	283cadca7e872ad6685c9247959ac059e231d358
+++ monotone.texi	07d5b5af7b2c2af335d21f0b04c1682d438a019e
@@ -8083,6 +8083,17 @@ @subsection User Defaults
 @address@hidden option; monotone will guess that you want
 to use the unique private key.
 
address@hidden get_netsync_key(@var{server}, @var{include}, @var{exclude})
+
+Returns a string which is the name of the key to use to authenticate
+the given netsync connection. When called by the @command{serve} command,
address@hidden is the address monotone is listening on, @var{include} is
address@hidden"*"}, and @var{exclude} is @option{""}.
+
+There is no default definition of this hook. The command-line option
address@hidden@var{keyname}} overrides any value returned from this
+hook function.
+
 @item get_passphrase (@var{keypair_id})
 
 Returns a string which is the passphrase used to encrypt the private