#
#
# patch "monotone.texi"
#  from [1d2defc51bd8d2237be451e98dc94711984c005e]
#    to [70b9b8ab55ce71e9259da780c337bd3f385d47ee]
#
============================================================
--- monotone.texi	1d2defc51bd8d2237be451e98dc94711984c005e
+++ monotone.texi	70b9b8ab55ce71e9259da780c337bd3f385d47ee
@@ -9912,7 +9912,7 @@ @subsection User Defaults
 @ftable @code
 @item get_branch_key (@var{branchname})
 
-Returns a string which is the name of an @sc{rsa} private key used to sign
+Returns a string which is the name or hash of an @sc{rsa} private key used to sign
 certificates in a particular branch @var{branchname}. There is no
 default definition for this hook. The command-line option
 @address@hidden overrides any value returned from this
@@ -9923,7 +9923,7 @@ @subsection User Defaults
 
 @item get_netsync_key(@var{server}, @var{include}, @var{exclude})
 
-Returns a string which is the name of the key to use to authenticate
+Returns a string which is the name or hash of the key to use to authenticate
 the given netsync connection. When called by the @command{serve} command,
 @var{server} is the address monotone is listening on, @var{include} is
 @option{"*"}, and @var{exclude} is @option{""}.
@@ -10111,7 +10111,7 @@ @subsection Netsync Permission Hooks
 @group
 pattern "address@hidden,address@hidden"
 allow "joe@@example.net"
-allow "jim@@example.net"
+allow "f3f62f86eba204a3ce15174083a53349201993d6"
 
 comment "everyone can read these branches"
 pattern "address@hidden,address@hidden"
@@ -10127,7 +10127,8 @@ @subsection Netsync Permission Hooks
 number of @code{allow} and @code{deny} lines, and possibly a @code{continue}
 line. Anything from the unquoted word @code{comment} until the next unquoted
 word is ignored. A stanza is processed if the argument to
address@hidden is a glob that matches @var{branch}. Any keys which match an
address@hidden is a glob that matches @var{branch}. Any keys with a hash or
+local_name that matches an
 @code{allow} line are given access, and any keys which match a @code{deny} line
 are denied access. If there is a @code{continue "true"} line, then if the key
 is not granted or denied access in this stanza the next matching stanza will be
@@ -10146,7 +10147,8 @@ @subsection Netsync Permission Hooks
 be allowed to write into your database certs, revisions, manifests, and
 files; otherwise @code{false}. The default definition of this hook reads a file
 @file{write-permissions} in the configuration directory which contains a list
-of keys, one per line, which are allowed write access. The special value
+of key hashes or local key names, one per line, which are allowed write access.
+The special value
 @code{*} means to allow access to anyone whose public key we already have.
 
 If a client connects anonymously, it will be unconditionally denied