# 
# patch "ChangeLog"
#  from [e284e1c44121ff90605022be1b206620fc0c83bb]
#    to [cf6ee343befe2c7ec346860d77d0d89402b8988b]
# 
# patch "lua.cc"
#  from [6d767a93a1f123c5ee86f3e1dd352da1beecbbf9]
#    to [174258e3ab931585b49e5490ffd82c83257bf63e]
# 
# patch "monotone.1"
#  from [e1dc755c77a557270d1c1ca35432320b1992eb72]
#    to [2b4b5dcbaba333709862fe47c0f02647e138a315]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,10 @@
 2005-05-08  Matthew Gregan  <address@hidden>
 
+	* monotone.1: Document --pid-file option.  Also make some minor
+	spelling and punctuation fixes.
+
+2005-05-08  Matthew Gregan  <address@hidden>
+
 	* monotone.texi: Right words, wrong order.
 	* testsuite.at: Drop pid mapping trickery, it doesn't work
 	consistently.  We now try and use SysInternal's pskill to kill the
--- lua.cc
+++ lua.cc
@@ -447,12 +447,11 @@
     return *this; 
   }
 
-
   Lua & call(int in, int out) 
   { 
     if (failed) return *this;
     I(lua_checkstack (st, out));
-    if (lua_pcall(st, in, out, 0) != 0) 
+    if (lua_pcall(st, in, out, 0) != 0)
       { 
         I(lua_isstring (st, -1));
         string err = string(lua_tostring(st, -1), lua_strlen(st, -1));
--- monotone.1
+++ monotone.1
@@ -146,7 +146,7 @@
 .TP
 \fBcommit\fP \fI[--message=<log message>] [<pathname>...]\fP 
 Commit working copy to database. If a --message option is provided on
-the command ine, it is used; otherwise a log message editor will be
+the command line, it is used; otherwise a log message editor will be
 invoked.
 .TP
 \fBupdate\fP  \fI[revision-id]\fP
@@ -156,16 +156,18 @@
 Turn on inodeprints mode, and force a cache refresh.
 .TP
 \fBpush\fP \fI[<host> [<collection>]]\fP 
-Push contents of \fI<collection>\fP to database on \fI<host>\fP 
+Push contents of \fI<collection>\fP to database on \fI<host>\fP.
 .TP
 \fBpull\fP \fI[<host> [<collection>]]\fP 
-Push contents of \fI<collection>\fP from database on \fI<host>\fP 
+Push contents of \fI<collection>\fP from database on \fI<host>\fP.
 .TP
 \fBsync\fP \fI<host> <collection>\fP 
-Sync contents of \fI<collection>\fP with database on \fI<host>\fP 
+Sync contents of \fI<collection>\fP with database on \fI<host>\fP.
 .TP
-\fBserve\fP \fI<host> <collection>\fP 
-Serve contents of \fI<collection>\fP at network address \fI<host>\fP 
+\fBserve\fP \fI[--pid-file=<path>] <host> <collection>\fP 
+Serve contents of \fI<collection>\fP at network address \fI<host>\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.
 .TP
 \fBset\fP \fI<domain> <name> <value>\fP 
 Set the db var \fI<name>\fP in domain \fI<domain>\fP to value