1.1 --- a/en/tour-basic.tex	Fri Oct 13 15:34:54 2006 -0700
     1.2 +++ b/en/tour-basic.tex	Fri Oct 13 15:48:44 2006 -0700
     1.3 @@ -182,6 +182,12 @@
     1.4  The default output printed by \hgcmd{log} is purely a summary; it is
     1.5  missing a lot of detail.
     1.6  
     1.7 +Figure~\ref{fig:tour:history} provides a graphical representation of
     1.8 +the history of the \dirname{hello} repository, to make it a little
     1.9 +easier to see which direction history is ``flowing'' in.  We'll be
    1.10 +returning to this figure several times in this chapter and the chapter
    1.11 +that follows.
    1.12 +
    1.13  \begin{figure}[ht]
    1.14    \centering
    1.15    \grafix{tour-history}
    1.16 @@ -189,24 +195,29 @@
    1.17    \label{fig:tour:history}
    1.18  \end{figure}
    1.19  
    1.20 -\subsection{Changesets, revisions, and identification}
    1.21 -
    1.22 -English being a notoriously sloppy language, we have a variety of
    1.23 -terms that have the same meaning.  If you are talking about Mercurial
    1.24 -history with other people, you will find that the word ``changeset''
    1.25 -is often compressed to ``change'' or ``cset'', and sometimes a
    1.26 -changeset is referred to as a ``revision'' or a ``rev''.
    1.27 +\subsection{Changesets, revisions, and talking to other 
    1.28 +  people}
    1.29 +
    1.30 +As English is a notoriously sloppy language, and computer science has
    1.31 +a history of terminological confusion, revision control has a variety
    1.32 +of terms that have the same meaning.  If you are talking about
    1.33 +Mercurial history with other people, you will find that the word
    1.34 +``changeset'' is often compressed to ``change'' or (when written)
    1.35 +``cset'', and sometimes a changeset is referred to as a ``revision''
    1.36 +or a ``rev''.
    1.37  
    1.38  While it doesn't matter what \emph{word} you use to refer to the
    1.39  concept of ``a~changeset'', the \emph{identifier} that you use to
    1.40  refer to ``a~\emph{specific} changeset'' is of great importance.
    1.41  Recall that the \texttt{changeset} field in the output from
    1.42  \hgcmd{log} identifies a changeset using both a number and a
    1.43 -hexadecimal string.  The number is \emph{only valid in that
    1.44 -  repository}, while the hex string is the \emph{permanent, unchanging
    1.45 -  identifier} that will always identify that changeset in every copy
    1.46 -of the repository.
    1.47 -
    1.48 +hexadecimal string.
    1.49 +\begin{itemize}
    1.50 +\item The revision number is \emph{only valid in that repository},
    1.51 +\item while the hex string is the \emph{permanent, unchanging
    1.52 +    identifier} that will always identify that exact changeset in
    1.53 +  \emph{every} copy of the repository.
    1.54 +\end{itemize}
    1.55  This distinction is important.  If you send someone an email talking
    1.56  about ``revision~33'', there's a high likelihood that their
    1.57  revision~33 will \emph{not be the same} as yours.  The reason for this
    1.58 @@ -324,10 +335,10 @@
    1.59  not been modified.  
    1.60  
    1.61  The ``\texttt{M}'' indicates that Mercurial has noticed that we
    1.62 -modified \filename{hello.c}.  Notice that we didn't need to
    1.63 -\emph{inform} Mercurial that we were going to modify the file before
    1.64 -we started, or that we had modified the file after we were done; it
    1.65 -was able to figure this out itself.
    1.66 +modified \filename{hello.c}.  We didn't need to \emph{inform}
    1.67 +Mercurial that we were going to modify the file before we started, or
    1.68 +that we had modified the file after we were done; it was able to
    1.69 +figure this out itself.
    1.70  
    1.71  It's a little bit helpful to know that we've modified
    1.72  \filename{hello.c}, but we might prefer to know exactly \emph{what}