# 
# patch "ChangeLog"
#  from [d01742dc72132c5e57c0587a10cef49eb7aabe8b]
#    to [e284e1c44121ff90605022be1b206620fc0c83bb]
# 
# patch "monotone.texi"
#  from [7c589e6f1304ecf1b678a0f42bf16e78a6e6b98e]
#    to [1043aaa99cad1d0060f75058661a71ad85c12ac5]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,6 @@
 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
 	process.  If pskill is not available, we fall back to the old
--- monotone.texi
+++ monotone.texi
@@ -3612,7 +3612,7 @@
 these will clear your defaults, and cause them to be reset to the next
 person you netsync with.
 
-If a option @option{--pid-file} is specified, the command
+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
 identify specific monotone server processes.