1.1 --- a/en/hook.tex	Tue Aug 26 14:14:19 2008 -0700
     1.2 +++ b/en/hook.tex	Tue Aug 26 14:14:24 2008 -0700
     1.3 @@ -241,7 +241,7 @@
     1.4  \end{figure}
     1.5  
     1.6  All hooks follow the pattern in example~\ref{ex:hook:init}.  You add
     1.7 -an entry to the \rcsection{hooks} section of your \hgrc\.  On the left
     1.8 +an entry to the \rcsection{hooks} section of your \hgrc.  On the left
     1.9  is the name of the event to trigger on; on the right is the action to
    1.10  take.  As you can see, you can run an arbitrary shell command in a
    1.11  hook.  Mercurial passes extra information to the hook using

     2.1 --- a/en/intro.tex	Tue Aug 26 14:14:19 2008 -0700
     2.2 +++ b/en/intro.tex	Tue Aug 26 14:14:24 2008 -0700
     2.3 @@ -373,11 +373,16 @@
     2.4  learn to use the other.  Both tools are portable to all popular
     2.5  operating systems.
     2.6  
     2.7 +Prior to version 1.5, Subversion had no useful support for merges.
     2.8 +At the time of writing, its merge tracking capability is new, and known to be
     2.9 +\href{http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword}{complicated
    2.10 +  and buggy}.
    2.11 +
    2.12  Mercurial has a substantial performance advantage over Subversion on
    2.13  every revision control operation I have benchmarked.  I have measured
    2.14  its advantage as ranging from a factor of two to a factor of six when
    2.15  compared with Subversion~1.4.3's \emph{ra\_local} file store, which is
    2.16 -the fastest access method available).  In more realistic deployments
    2.17 +the fastest access method available.  In more realistic deployments
    2.18  involving a network-based store, Subversion will be at a substantially
    2.19  larger disadvantage.  Because many Subversion commands must talk to
    2.20  the server and Subversion does not have useful replication facilities,

     3.1 --- a/en/mq-collab.tex	Tue Aug 26 14:14:19 2008 -0700
     3.2 +++ b/en/mq-collab.tex	Tue Aug 26 14:14:24 2008 -0700
     3.3 @@ -156,7 +156,7 @@
     3.4  
     3.5  A guard cannot start with a ``\texttt{+}'' or ``\texttt{-}''
     3.6  character.  The name of a guard must not contain white space, but most
     3.7 -othter characters are acceptable.  If you try to use a guard with an
     3.8 +other characters are acceptable.  If you try to use a guard with an
     3.9  invalid name, MQ will complain:
    3.10  \interaction{mq.guards.qselect.error} 
    3.11  Changing the selected guards changes the patches that are applied.

     4.1 --- a/en/mq.tex	Tue Aug 26 14:14:19 2008 -0700
     4.2 +++ b/en/mq.tex	Tue Aug 26 14:14:24 2008 -0700
     4.3 @@ -737,7 +737,7 @@
     4.4  Referring to a patch by index isn't much different.  The first patch
     4.5  printed in the output of \hgxcmd{mq}{qseries} is patch zero (yes, it's one
     4.6  of those start-at-zero counting systems); the second is patch one; and
     4.7 -so on
     4.8 +so on.
     4.9  
    4.10  MQ also makes it easy to work with patches when you are using normal
    4.11  Mercurial commands.  Every command that accepts a changeset ID will

     5.1 --- a/en/template.tex	Tue Aug 26 14:14:19 2008 -0700
     5.2 +++ b/en/template.tex	Tue Aug 26 14:14:24 2008 -0700
     5.3 @@ -462,7 +462,7 @@
     5.4  
     5.5  We could have included the text of the template file directly in the
     5.6  style file by enclosing it in quotes and replacing the newlines with
     5.7 -``\texttt{\\n}'' sequences, but it would have made the style file too
     5.8 +``\verb!\n!'' sequences, but it would have made the style file too
     5.9  difficult to read.  Readability is a good guide when you're trying to
    5.10  decide whether some text belongs in a style file, or in a template
    5.11  file that the style file points to.  If the style file will look too

     6.1 --- a/en/tour-basic.tex	Tue Aug 26 14:14:19 2008 -0700
     6.2 +++ b/en/tour-basic.tex	Tue Aug 26 14:14:24 2008 -0700
     6.3 @@ -68,9 +68,14 @@
     6.4  a compatible version of Universal MacPython~\cite{web:macpython}.  This
     6.5  is easy to do; simply follow the instructions on Lee's site.
     6.6  
     6.7 +It's also possible to install Mercurial using Fink or MacPorts,
     6.8 +two popular free package managers for Mac OS X.  If you have Fink,
     6.9 +use \command{sudo apt-get install mercurial-py25}.  If MacPorts,
    6.10 +\command{sudo port install mercurial}.
    6.11 +
    6.12  \subsection{Windows}
    6.13  
    6.14 -Lee Cantey also publishes an installer of Mercurial for Windows at
    6.15 +Lee Cantey publishes an installer of Mercurial for Windows at
    6.16  \url{http://mercurial.berkwood.com}.  This package has no external
    6.17  dependencies; it ``just works''.
    6.18  

     7.1 --- a/en/undo.tex	Tue Aug 26 14:14:19 2008 -0700
     7.2 +++ b/en/undo.tex	Tue Aug 26 14:14:24 2008 -0700
     7.3 @@ -194,6 +194,8 @@
     7.4  So remember, to revert a \hgcmd{rename}, you must provide \emph{both}
     7.5  the source and destination names.  
     7.6  
     7.7 +% TODO: the output doesn't look like it will be removed!
     7.8 +
     7.9  (By the way, if you rename a file, then modify the renamed-to file,
    7.10  then revert both components of the rename, when Mercurial restores the
    7.11  file that was removed as part of the rename, it will be unmodified.
    7.12 @@ -282,6 +284,8 @@
    7.13  changeset.  Finally, it merges back to the previous parent of the
    7.14  working directory, and commits the result of the merge.
    7.15  
    7.16 +% TODO: to me it looks like mercurial doesn't commit the second merge automatically!
    7.17 +
    7.18  \begin{figure}[htb]
    7.19    \centering
    7.20    \grafix{undo-non-tip}
    7.21 @@ -644,7 +648,7 @@
    7.22  Even though we had~40 changesets to search through, the \hgcmd{bisect}
    7.23  command let us find the changeset that introduced our ``bug'' with
    7.24  only five tests.  Because the number of tests that the \hgcmd{bisect}
    7.25 -command grows logarithmically with the number of changesets to
    7.26 +command performs grows logarithmically with the number of changesets to
    7.27  search, the advantage that it has over the ``brute force'' search
    7.28  approach increases with every changeset you add.
    7.29