1.1 --- a/en/tour.tex	Wed Oct 04 13:11:40 2006 -0700
     1.2 +++ b/en/tour.tex	Wed Oct 04 15:15:54 2006 -0700
     1.3 @@ -4,13 +4,17 @@
     1.4  \section{Installing Mercurial on your system}
     1.5  \label{sec:tour:install}
     1.6  
     1.7 +Prebuilt binary packages of Mercurial are available for every popular
     1.8 +operating system.  These make it easy to start using Mercurial on your
     1.9 +computer immediately.
    1.10 +
    1.11  \subsection{Linux}
    1.12  
    1.13 -All major Linux distributions provide a prebuilt Mercurial package.
    1.14  Because each Linux distribution has its own packaging tools, policies,
    1.15  and rate of development, it's difficult to give a comprehensive set of
    1.16 -instructions on how to install Mercurial binaries, and the version of
    1.17 -Mercurial that you will end up with can vary widely.  
    1.18 +instructions on how to install Mercurial binaries.  The version of
    1.19 +Mercurial that you will end up with can vary depending on how active
    1.20 +the person is who maintains the package for your distribution.
    1.21  
    1.22  To keep things simple, I will focus on installing Mercurial from the
    1.23  command line under the most popular Linux distributions.  Most of
    1.24 @@ -18,43 +22,41 @@
    1.25  you install Mercurial with a single click; the package name to look
    1.26  for is \texttt{mercurial}.
    1.27  
    1.28 -\subsubsection{Debian}
    1.29 +\begin{itemize}
    1.30 +\item[Debian]
    1.31 +  \begin{codesample4}
    1.32 +    apt-get install mercurial
    1.33 +  \end{codesample4}
    1.34  
    1.35 -\begin{codesample2}
    1.36 -  apt-get install mercurial
    1.37 -\end{codesample2}
    1.38 +\item[Fedora Core]
    1.39 +  \begin{codesample4}
    1.40 +    yum install mercurial
    1.41 +  \end{codesample4}
    1.42  
    1.43 -\subsubsection{Fedora Core}
    1.44 +\item[Gentoo]
    1.45 +  \begin{codesample4}
    1.46 +    emerge mercurial
    1.47 +  \end{codesample4}
    1.48  
    1.49 -\begin{codesample2}
    1.50 -  yum install mercurial
    1.51 -\end{codesample2}
    1.52 +\item[OpenSUSE]
    1.53 +  \begin{codesample4}
    1.54 +    yum install mercurial
    1.55 +  \end{codesample4}
    1.56  
    1.57 -\subsubsection{Gentoo}
    1.58 -
    1.59 -\begin{codesample2}
    1.60 -  emerge mercurial
    1.61 -\end{codesample2}
    1.62 -
    1.63 -\subsubsection{OpenSUSE}
    1.64 -
    1.65 -\begin{codesample2}
    1.66 -  yum install mercurial
    1.67 -\end{codesample2}
    1.68 -
    1.69 -\subsubsection{Ubuntu}
    1.70 -
    1.71 -\begin{codesample2}
    1.72 -  apt-get install mercurial
    1.73 -\end{codesample2}
    1.74 +\item[Ubuntu] Ubuntu's Mercurial package is particularly old, and you
    1.75 +  should not use it.  If you know how, you can rebuild and install the
    1.76 +  Debian package.  It's probably easier to build Mercurial from source
    1.77 +  and simply run that; see section~\ref{sec:srcinstall:unixlike} for
    1.78 +  details.
    1.79 +\end{itemize}
    1.80  
    1.81  \subsection{Mac OS X}
    1.82  
    1.83  Lee Cantey publishes an installer of Mercurial for Mac OS~X at
    1.84  \url{http://mercurial.berkwood.com}.  This package works on both
    1.85 -Intel- and Power-based Macs, but requires you to install Universal
    1.86 -Python before you can use it.  This is easy to do; simply follow the
    1.87 -instructions on Lee's site.
    1.88 +Intel-~and Power-based Macs.  Before you can use it, you must install
    1.89 +a compatible version of Universal MacPython~\cite{web:macpython}.  This
    1.90 +is easy to do; simply follow the instructions on Lee's site.
    1.91  
    1.92  \subsection{Solaris}
    1.93  
    1.94 @@ -73,6 +75,7 @@
    1.95    work. XXX Flesh this out.
    1.96  \end{note}
    1.97  
    1.98 +
    1.99  %%% Local Variables: 
   1.100  %%% mode: latex
   1.101  %%% TeX-master: "00book"