1.1 --- a/en/collab.tex	Tue Aug 26 14:14:24 2008 -0700
     1.2 +++ b/en/collab.tex	Sun Aug 31 12:14:23 2008 -0400
     1.3 @@ -461,7 +461,7 @@
     1.4  take a look at your system documentation to figure out how to install
     1.5  it.
     1.6  
     1.7 -On Windows, you'll first need to choose download a suitable ssh
     1.8 +On Windows, you'll first need to download a suitable ssh
     1.9  client.  There are two alternatives.
    1.10  \begin{itemize}
    1.11  \item Simon Tatham's excellent PuTTY package~\cite{web:putty} provides
    1.12 @@ -495,7 +495,7 @@
    1.13  
    1.14  When you generate a key pair, it's usually \emph{highly} advisable to
    1.15  protect it with a passphrase.  (The only time that you might not want
    1.16 -to do this id when you're using the ssh protocol for automated tasks
    1.17 +to do this is when you're using the ssh protocol for automated tasks
    1.18  on a secure network.)
    1.19  
    1.20  Simply generating a key pair isn't enough, however.  You'll need to
    1.21 @@ -737,7 +737,7 @@
    1.22  named something like \dirname{public\_html} in their home directory,
    1.23  from which they can serve up web pages.  A file named \filename{foo}
    1.24  in this directory will be accessible at a URL of the form
    1.25 -\texttt{http://www.example.com/\~username/foo}.
    1.26 +\texttt{http://www.example.com/\~{}username/foo}.
    1.27  
    1.28  To get started, find the \sfilename{hgweb.cgi} script that should be
    1.29  present in your Mercurial installation.  If you can't quickly find a

     2.1 --- a/en/concepts.tex	Tue Aug 26 14:14:24 2008 -0700
     2.2 +++ b/en/concepts.tex	Sun Aug 31 12:14:23 2008 -0400
     2.3 @@ -309,7 +309,7 @@
     2.4  changesets to see which one introduced a bug.  In cases like this, the
     2.5  natural thing to do is update the working directory to the changeset
     2.6  you're interested in, and then examine the files in the working
     2.7 -directory directly to see their contents as they werea when you
     2.8 +directory directly to see their contents as they were when you
     2.9  committed that changeset.  The effect of this is shown in
    2.10  figure~\ref{fig:concepts:wdir-pre-branch}.
    2.11  

     3.1 --- a/en/hook.tex	Tue Aug 26 14:14:24 2008 -0700
     3.2 +++ b/en/hook.tex	Sun Aug 31 12:14:23 2008 -0400
     3.3 @@ -509,7 +509,7 @@
     3.4  whitespace from a file.  This is concise and useful enough that I will
     3.5  reproduce it here.
     3.6  \begin{codesample2}
     3.7 -  perl -pi -e 's,\\s+\$,,' filename
     3.8 +  perl -pi -e 's,[ \textbackslash{}t]+\$,,' filename
     3.9  \end{codesample2}
    3.10  
    3.11  \section{Bundled hooks}

     4.1 --- a/en/mq-collab.tex	Tue Aug 26 14:14:24 2008 -0700
     4.2 +++ b/en/mq-collab.tex	Sun Aug 31 12:14:23 2008 -0400
     4.3 @@ -275,7 +275,7 @@
     4.4    backports a piece of code to~2.6.9 will have a~\texttt{2.6.9} guard.
     4.5  \end{itemize}
     4.6  This variety of guards gives me considerable flexibility in
     4.7 -qdetermining what kind of source tree I want to end up with.  For most
     4.8 +determining what kind of source tree I want to end up with.  For most
     4.9  situations, the selection of appropriate guards is automated during
    4.10  the build process, but I can manually tune the guards to use for less
    4.11  common circumstances.

     5.1 --- a/en/mq.tex	Tue Aug 26 14:14:24 2008 -0700
     5.2 +++ b/en/mq.tex	Sun Aug 31 12:14:23 2008 -0400
     5.3 @@ -525,7 +525,7 @@
     5.4  modifies \filename{foo} with six hunks, and one of them fails to
     5.5  apply, you will have: an unmodified \filename{foo.orig}, a
     5.6  \filename{foo.rej} containing one hunk, and \filename{foo}, containing
     5.7 -the changes made by the five successful five hunks.
     5.8 +the changes made by the five successful hunks.
     5.9  
    5.10  \subsection{Some quirks of patch representation}
    5.11  

     6.1 --- a/en/template.tex	Tue Aug 26 14:14:24 2008 -0700
     6.2 +++ b/en/template.tex	Sun Aug 31 12:14:23 2008 -0400
     6.3 @@ -244,7 +244,7 @@
     6.4    date using the same format used in email headers.  Yields a string
     6.5    like ``\Verb+Mon, 04 Sep 2006 15:13:13 -0700+''.
     6.6  \item[\tplkwfilt{node}{short}] Changeset hash.  Yield the short form
     6.7 -  of a changeset hash, i.e.~a 12-byte hexadecimal string.
     6.8 +  of a changeset hash, i.e.~a 12-character hexadecimal string.
     6.9  \item[\tplkwfilt{date}{shortdate}] \tplkword{date} keyword.  Render
    6.10    the year, month, and day of the date.  Yields a string like
    6.11    ``\Verb+2006-09-04+''.
    6.12 @@ -452,7 +452,7 @@
    6.13  \item Subversion's output includes a count in the header of the number
    6.14    of lines in the commit message.  We cannot replicate this in
    6.15    Mercurial; the templating engine does not currently provide a filter
    6.16 -  that counts the number of items it is passed.
    6.17 +  that counts the number of lines the template generates.
    6.18  \end{itemize}
    6.19  It took me no more than a minute or two of work to replace literal
    6.20  text from an example of Subversion's output with some keywords and