1.1 --- a/en/ch04-concepts.tex	Thu Jan 29 22:56:27 2009 -0800
     1.2 +++ b/en/ch04-concepts.tex	Thu Feb 05 00:01:16 2009 -0800
     1.3 @@ -39,8 +39,7 @@
     1.4  \begin{figure}[ht]
     1.5    \centering
     1.6    \grafix{filelog}
     1.7 -  \caption{Relationships between files in working directory and
     1.8 -    filelogs in repository}
     1.9 +  \caption{Relationships between files in working directory and filelogs in repository}
    1.10    \label{fig:concepts:filelog}
    1.11  \end{figure}
    1.12  
    1.13 @@ -205,8 +204,7 @@
    1.14  after the corrupted section.  This would not be possible with a
    1.15  delta-only storage model.
    1.16  
    1.17 -\section{Revision history, branching,
    1.18 -  and merging}
    1.19 +\section{Revision history, branching, and merging}
    1.20  
    1.21  Every entry in a Mercurial revlog knows the identity of its immediate
    1.22  ancestor revision, usually referred to as its \emph{parent}.  In fact,
    1.23 @@ -265,8 +263,7 @@
    1.24  \subsection{What happens when you commit}
    1.25  
    1.26  The dirstate stores parent information for more than just book-keeping
    1.27 -purposes.  Mercurial uses the parents of the dirstate as \emph{the
    1.28 -  parents of a new changeset} when you perform a commit.
    1.29 +purposes.  Mercurial uses the parents of the dirstate as \emph{the parents of a new changeset} when you perform a commit.
    1.30  
    1.31  \begin{figure}[ht]
    1.32    \centering