#
# patch "ChangeLog"
# from [884340816c0ef5e8e7b42d4ddbbc2b697f3fc888]
# to [8cd20c1dee5429920318306b4773eea178841f61]
#
# patch "monotone.1"
# from [da6b32b820606a2fa282d47374330c0ca455ffb8]
# to [104d714487823663f55d6739f60e0620b9da2104]
#
# patch "monotone.texi"
# from [344377efb15388541a16b1b453eefe80eff1a7a2]
# to [75f1c39cd232ca3c9c2a3ed833a98a4c7d67045d]
#
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2005-07-10 Richard Levitte
+
+ * monotone.texi (Network), monotone.1: Mention the default port
+ number.
+
2005-07-07 Matthew Gregan
* win32/monotone.iss: Bump version number.
--- monotone.1
+++ monotone.1
@@ -171,10 +171,11 @@
\fBsync\fP \fI \fP
Sync contents of \fI\fP with database on \fI\fP.
.TP
-\fBserve\fP \fI[--pid-file=] \fP
-Serve contents of \fI\fP at network address \fI\fP. If a
---pid-file option is provided on the command line, monotone will store the
-process id of the server in the specified file.
+\fBserve\fP \fI[--pid-file=] [: \fP
+Serve contents of \fI\fP at network address \fI\fP, on the
+port \fI\fP. If \fI\fP isn't given, 5253 is used. If a
+--pid-file option is provided on the command line, monotone will store
+the process id of the server in the specified file.
.TP
\fBset\fP \fI \fP
Set the db var \fI\fP in domain \fI\fP to value
--- monotone.texi
+++ monotone.texi
@@ -3668,9 +3668,10 @@
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 @var{glob} parameters indicate a set of
-branches to exchange; every branch which matches a @var{glob} exactly
-will be indexed and made available for synchronization.
+and a port number. The default port number is 5253. The @var{glob}
+parameters indicate a set of branches to exchange; every branch which
+matches a @var{glob} exactly 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