# 
# patch "ChangeLog"
#  from [683818fdb59ab01eb7b399f0fbd1a0e0931899b9]
#    to [8d7dc6a20bcb242b06ce09dbf341d1867b9106f6]
# 
# patch "monotone.texi"
#  from [ded6d505b8240d0a1c08c36abb07da288543ddbc]
#    to [161724dddefe2496e2f6f899538a7e1d893586eb]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2005-05-17  Nathaniel Smith  <address@hidden>
+
+	* monotone.texi (Network): Document 'serve' as taking more than
+	one collection argument.
+
 2005-05-15  graydon hoare  <address@hidden>
 
 	* rcs_import.cc (note_state_at_branch_beginning): collect
--- monotone.texi
+++ monotone.texi
@@ -3559,7 +3559,7 @@
 @section Network
 
 @ftable @command
address@hidden monotone serve @var{address} @var{collection}
address@hidden monotone serve @var{address} @var{collection1} address@hidden ...]
 @itemx monotone pull address@hidden address@hidden
 @itemx monotone push address@hidden address@hidden
 @itemx monotone sync address@hidden address@hidden
@@ -3576,6 +3576,13 @@
 branches to exchange; every branch for which @var{collection} is a
 prefix will be indexed and made available for synchronization.
 
+The @command{serve} command can take multiple collections, and it will
+then accept clients requesting any of the listed collections.  Different
+permissions can be applied to each collection; see the hooks
address@hidden, @code{get_netsync_write_permitted},
+and @code{get_netsync_anonymous_read_permitted}, all of which take a
address@hidden argument (see @ref{Hook Reference}).
+
 For example, supposing Bob and Alice wish to synchronize their
 @code{net.venge.monotone.win32} and @code{net.venge.monotone.i18n}
 branches. Supposing Alice's computer has hostname