1.1 --- a/en/99book.bib	Wed May 30 22:05:35 2007 -0700
     1.2 +++ b/en/99book.bib	Wed May 30 22:18:04 2007 -0700
     1.3 @@ -33,10 +33,10 @@
     1.4    note = 	 {\url{http://cyberelk.net/tim/patchutils/}},
     1.5  }
     1.6  
     1.7 -@Misc{web:rej,
     1.8 +@Misc{web:mpatch,
     1.9    author = 	 {Chris Mason},
    1.10 -  title = 	 {\texttt{rej}--help solve patch rejects},
    1.11 -  note = 	 {\url{http://oss.oracle.com/mercurial}},
    1.12 +  title = 	 {\texttt{mpatch}--help solve patch rejects},
    1.13 +  note = 	 {\url{http://oss.oracle.com/~mason/mpatch/}},
    1.14  }
    1.15  
    1.16  @Misc{web:wiggle,

     2.1 --- a/en/mq.tex	Wed May 30 22:05:35 2007 -0700
     2.2 +++ b/en/mq.tex	Wed May 30 22:18:04 2007 -0700
     2.3 @@ -591,10 +591,11 @@
     2.4  vigorous than \command{patch} in its attempts to make a patch apply.
     2.5  
     2.6  Another Linux kernel hacker, Chris Mason (the author of Mercurial
     2.7 -Queues), wrote a similar tool called \command{rej}~\cite{web:rej},
     2.8 -which takes a simple approach to automating the application of hunks
     2.9 -rejected by \command{patch}.  \command{rej} can help with four common
    2.10 -reasons that a hunk may be rejected:
    2.11 +Queues), wrote a similar tool called
    2.12 +\command{mpatch}~\cite{web:mpatch}, which takes a simple approach to
    2.13 +automating the application of hunks rejected by \command{patch}.  The
    2.14 +\command{mpatch} command can help with four common reasons that a hunk
    2.15 +may be rejected:
    2.16  
    2.17  \begin{itemize}
    2.18  \item The context in the middle of a hunk has changed.
    2.19 @@ -605,9 +606,9 @@
    2.20    currently present in the file.
    2.21  \end{itemize}
    2.22  
    2.23 -If you use \command{wiggle} or \command{rej}, you should be doubly
    2.24 +If you use \command{wiggle} or \command{mpatch}, you should be doubly
    2.25  careful to check your results when you're done.  In fact,
    2.26 -\command{rej} enforces this method of double-checking the tool's
    2.27 +\command{mpatch} enforces this method of double-checking the tool's
    2.28  output, by automatically dropping you into a merge program when it has
    2.29  done its job, so that you can verify its work and finish off any
    2.30  remaining merges.