1.1 --- a/en/00book.tex	Wed Oct 04 13:11:40 2006 -0700
     1.2 +++ b/en/00book.tex	Wed Oct 04 15:15:54 2006 -0700
     1.3 @@ -45,6 +45,7 @@
     1.4  \include{mq}
     1.5  
     1.6  \appendix
     1.7 +\include{srcinstall}
     1.8  \include{license}
     1.9  \addcontentsline{toc}{chapter}{Bibliography}
    1.10  \bibliographystyle{alpha}

     2.1 --- a/en/99book.bib	Wed Oct 04 13:11:40 2006 -0700
     2.2 +++ b/en/99book.bib	Wed Oct 04 15:15:54 2006 -0700
     2.3 @@ -56,3 +56,9 @@
     2.4    title =	 {GNU Coding Standards---Change Logs},
     2.5    note =	 {\url{http://www.gnu.org/prep/standards/html_node/Change-Logs.html}},
     2.6  }
     2.7 +
     2.8 +@Misc{web:macpython,
     2.9 +  author =	 {Bob Ippolito, Ronald Oussoren},
    2.10 +  title =	 {Universal MacPython},
    2.11 +  note =	 {\url{http://bob.pythonmac.org/archives/2006/04/10/python-and-universal-binaries-on-mac-os-x/}},
    2.12 +}

     3.1 --- a/en/Makefile	Wed Oct 04 13:11:40 2006 -0700
     3.2 +++ b/en/Makefile	Wed Oct 04 15:15:54 2006 -0700
     3.3 @@ -13,6 +13,7 @@
     3.4  	intro.tex \
     3.5  	mq.tex \
     3.6  	preface.tex \
     3.7 +	srcinstall.tex \
     3.8  	template.tex \
     3.9  	tour.tex
    3.10  

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/en/srcinstall.tex	Wed Oct 04 15:15:54 2006 -0700
     4.3 @@ -0,0 +1,53 @@
     4.4 +\chapter{Installing Mercurial from source}
     4.5 +\label{chap:srcinstall}
     4.6 +
     4.7 +\section{On a Unix-like system}
     4.8 +\label{sec:srcinstall:unixlike}
     4.9 +
    4.10 +If you are using a Unix-like system that has a sufficiently recent
    4.11 +version of Python (2.3~or newer) available, it is easy to install
    4.12 +Mercurial from source.
    4.13 +\begin{enumerate}
    4.14 +\item Download a recent source tarball from
    4.15 +  \url{http://www.selenic.com/mercurial/download}.
    4.16 +\item Unpack the tarball:
    4.17 +  \begin{codesample4}
    4.18 +    gzip -dc mercurial-\emph{version}.tar.gz | tar xf -
    4.19 +  \end{codesample4}
    4.20 +\item Go into the source directory and run the installer script.  This
    4.21 +  will build Mercurial and install it in your home directory.
    4.22 +  \begin{codesample4}
    4.23 +    cd mercurial-\emph{version}
    4.24 +    python setup.py install --force --home=\$HOME
    4.25 +  \end{codesample4}
    4.26 +\end{enumerate}
    4.27 +Once the install finishes, Mercurial will be in the \texttt{bin}
    4.28 +subdirectory of your home directory.  Don't forget to make sure that
    4.29 +this directory is present in your shell's search path.
    4.30 +
    4.31 +You will probably need to set the \envar{PYTHONPATH} environment
    4.32 +variable so that the Mercurial executable can find the rest of the
    4.33 +Mercurial packages.  For example, on my laptop, I have set it to
    4.34 +\texttt{/home/bos/lib/python}.  The exact path that you will need to
    4.35 +use depends on how Python was built for your system, but should be
    4.36 +easy to figure out.  If you're uncertain, look through the output of
    4.37 +the installer script above, and see where the contents of the
    4.38 +\texttt{mercurial} directory were installed to.
    4.39 +
    4.40 +\section{On Windows}
    4.41 +
    4.42 +Building and installing Mercurial on Windows requires a variety of
    4.43 +tools, a fair amount of technical knowledge, and considerable
    4.44 +patience.  I very much \emph{do not recommend} this route if you are a
    4.45 +``casual user''.  Unless you intend to hack on Mercurial, I strongly
    4.46 +suggest that you use a binary package instead.
    4.47 +
    4.48 +If you are intent on building Mercurial from source on Windows, follow
    4.49 +the ``hard way'' directions on the Mercurial wiki at
    4.50 +\url{http://www.selenic.com/mercurial/wiki/index.cgi/WindowsInstall},
    4.51 +and expect the process to involve a lot of fiddly work.
    4.52 +
    4.53 +%%% Local Variables: 
    4.54 +%%% mode: latex
    4.55 +%%% TeX-master: "00book"
    4.56 +%%% End: 

     5.1 --- a/en/tour.tex	Wed Oct 04 13:11:40 2006 -0700
     5.2 +++ b/en/tour.tex	Wed Oct 04 15:15:54 2006 -0700
     5.3 @@ -4,13 +4,17 @@
     5.4  \section{Installing Mercurial on your system}
     5.5  \label{sec:tour:install}
     5.6  
     5.7 +Prebuilt binary packages of Mercurial are available for every popular
     5.8 +operating system.  These make it easy to start using Mercurial on your
     5.9 +computer immediately.
    5.10 +
    5.11  \subsection{Linux}
    5.12  
    5.13 -All major Linux distributions provide a prebuilt Mercurial package.
    5.14  Because each Linux distribution has its own packaging tools, policies,
    5.15  and rate of development, it's difficult to give a comprehensive set of
    5.16 -instructions on how to install Mercurial binaries, and the version of
    5.17 -Mercurial that you will end up with can vary widely.  
    5.18 +instructions on how to install Mercurial binaries.  The version of
    5.19 +Mercurial that you will end up with can vary depending on how active
    5.20 +the person is who maintains the package for your distribution.
    5.21  
    5.22  To keep things simple, I will focus on installing Mercurial from the
    5.23  command line under the most popular Linux distributions.  Most of
    5.24 @@ -18,43 +22,41 @@
    5.25  you install Mercurial with a single click; the package name to look
    5.26  for is \texttt{mercurial}.
    5.27  
    5.28 -\subsubsection{Debian}
    5.29 +\begin{itemize}
    5.30 +\item[Debian]
    5.31 +  \begin{codesample4}
    5.32 +    apt-get install mercurial
    5.33 +  \end{codesample4}
    5.34  
    5.35 -\begin{codesample2}
    5.36 -  apt-get install mercurial
    5.37 -\end{codesample2}
    5.38 +\item[Fedora Core]
    5.39 +  \begin{codesample4}
    5.40 +    yum install mercurial
    5.41 +  \end{codesample4}
    5.42  
    5.43 -\subsubsection{Fedora Core}
    5.44 +\item[Gentoo]
    5.45 +  \begin{codesample4}
    5.46 +    emerge mercurial
    5.47 +  \end{codesample4}
    5.48  
    5.49 -\begin{codesample2}
    5.50 -  yum install mercurial
    5.51 -\end{codesample2}
    5.52 +\item[OpenSUSE]
    5.53 +  \begin{codesample4}
    5.54 +    yum install mercurial
    5.55 +  \end{codesample4}
    5.56  
    5.57 -\subsubsection{Gentoo}
    5.58 -
    5.59 -\begin{codesample2}
    5.60 -  emerge mercurial
    5.61 -\end{codesample2}
    5.62 -
    5.63 -\subsubsection{OpenSUSE}
    5.64 -
    5.65 -\begin{codesample2}
    5.66 -  yum install mercurial
    5.67 -\end{codesample2}
    5.68 -
    5.69 -\subsubsection{Ubuntu}
    5.70 -
    5.71 -\begin{codesample2}
    5.72 -  apt-get install mercurial
    5.73 -\end{codesample2}
    5.74 +\item[Ubuntu] Ubuntu's Mercurial package is particularly old, and you
    5.75 +  should not use it.  If you know how, you can rebuild and install the
    5.76 +  Debian package.  It's probably easier to build Mercurial from source
    5.77 +  and simply run that; see section~\ref{sec:srcinstall:unixlike} for
    5.78 +  details.
    5.79 +\end{itemize}
    5.80  
    5.81  \subsection{Mac OS X}
    5.82  
    5.83  Lee Cantey publishes an installer of Mercurial for Mac OS~X at
    5.84  \url{http://mercurial.berkwood.com}.  This package works on both
    5.85 -Intel- and Power-based Macs, but requires you to install Universal
    5.86 -Python before you can use it.  This is easy to do; simply follow the
    5.87 -instructions on Lee's site.
    5.88 +Intel-~and Power-based Macs.  Before you can use it, you must install
    5.89 +a compatible version of Universal MacPython~\cite{web:macpython}.  This
    5.90 +is easy to do; simply follow the instructions on Lee's site.
    5.91  
    5.92  \subsection{Solaris}
    5.93  
    5.94 @@ -73,6 +75,7 @@
    5.95    work. XXX Flesh this out.
    5.96  \end{note}
    5.97  
    5.98 +
    5.99  %%% Local Variables: 
   5.100  %%% mode: latex
   5.101  %%% TeX-master: "00book"