# 
# patch "ChangeLog"
#  from [ebed673522c42d97631b84ff9453fd3b96b03852]
#    to [9303d644d87356150ad61d374d54d98ea92eac6f]
# 
# patch "monotone.texi"
#  from [6f5d43f75aeed98ee3502403ebbd5fac88f4c9b5]
#    to [874fbe044a630abf6de449c5e39a511e9091db40]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,10 @@
 2005-07-11  Nathaniel Smith  <address@hidden>
 
+	* monotone.texi (Network): Tweak documentation for netsync
+	commands.
+
+2005-07-11  Nathaniel Smith  <address@hidden>
+
 	* app_state.{hh,cc} (exclude_patterns, add_exclude): 
 	* options.hh (OPT_EXCLUDE): 
 	* monotone.cc (coptions, cpp_main): New option --exclude.
--- monotone.texi
+++ monotone.texi
@@ -3656,7 +3656,7 @@
 @section Network
 
 @ftable @command
address@hidden monotone serve @var{address}[:@var{port}] @var{glob} [...]
address@hidden monotone serve @var{address}[:@var{port}] @var{glob} [...] address@hidden
 @itemx monotone pull [--set-default] address@hidden:@var{port}] address@hidden [...] address@hidden
 @itemx monotone push [--set-default] address@hidden:@var{port}] address@hidden [...] address@hidden
 @itemx monotone sync [--set-default] address@hidden:@var{port}] address@hidden [...] address@hidden
@@ -3670,17 +3670,11 @@
 The network @var{address} specified in each case should be the same: a
 host name to listen on, or connect to, optionally followed by a colon
 and a port number.  The default port number is 5253. The @var{glob}
-parameters indicate a set of branches to exchange; every branch which
+parameters indicate a set of branches to exchange.  Multiple @var{glob}
+and @option{--exclude} options can be specified; every branch which
 matches a @var{glob} exactly, and does not match an @var{exclude-glob},
 will be indexed and made available for synchronization.
 
-The @command{serve} command can take multiple globs, and it will make
-available all branches matching any of them.  Different permissions can
-be applied to each branch; see the hooks
address@hidden, @code{get_netsync_write_permitted},
-and @code{get_netsync_anonymous_read_permitted} (see @ref{Hook
-Reference}).
-
 For example, perhaps 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
@@ -3723,6 +3717,11 @@
 option when connecting to the server and branch pattern that you want to
 make the new default.
 
+In the server, different permissions can be applied to each branch; see
+the hooks @code{get_netsync_read_permitted},
address@hidden, and
address@hidden (see @ref{Hook Reference}).
+
 If a @option{--pid-file} option is specified, the command
 @command{serve} will create the specified file and record the process
 identifier of the server in the file.  This file can then be read to