changeset 559:a1b640641d37

merging from serpentine

--- a/en/collab.tex	Sun Dec 21 23:07:13 2008 -0500
+++ b/en/collab.tex	Sat Dec 27 09:30:45 2008 -0500
@@ -461,7 +461,7 @@
 take a look at your system documentation to figure out how to install
 it.
 
-On Windows, you'll first need to choose download a suitable ssh
+On Windows, you'll first need to download a suitable ssh
 client.  There are two alternatives.
 \begin{itemize}
 \item Simon Tatham's excellent PuTTY package~\cite{web:putty} provides
@@ -495,7 +495,7 @@
 
 When you generate a key pair, it's usually \emph{highly} advisable to
 protect it with a passphrase.  (The only time that you might not want
-to do this id when you're using the ssh protocol for automated tasks
+to do this is when you're using the ssh protocol for automated tasks
 on a secure network.)
 
 Simply generating a key pair isn't enough, however.  You'll need to
@@ -737,7 +737,7 @@
 named something like \dirname{public\_html} in their home directory,
 from which they can serve up web pages.  A file named \filename{foo}
 in this directory will be accessible at a URL of the form
-\texttt{http://www.example.com/\~username/foo}.
+\texttt{http://www.example.com/\~{}username/foo}.
 
 To get started, find the \sfilename{hgweb.cgi} script that should be
 present in your Mercurial installation.  If you can't quickly find a

--- a/en/concepts.tex	Sun Dec 21 23:07:13 2008 -0500
+++ b/en/concepts.tex	Sat Dec 27 09:30:45 2008 -0500
@@ -309,7 +309,7 @@
 changesets to see which one introduced a bug.  In cases like this, the
 natural thing to do is update the working directory to the changeset
 you're interested in, and then examine the files in the working
-directory directly to see their contents as they werea when you
+directory directly to see their contents as they were when you
 committed that changeset.  The effect of this is shown in
 figure~\ref{fig:concepts:wdir-pre-branch}.
 

--- a/en/hook.tex	Sun Dec 21 23:07:13 2008 -0500
+++ b/en/hook.tex	Sat Dec 27 09:30:45 2008 -0500
@@ -509,7 +509,7 @@
 whitespace from a file.  This is concise and useful enough that I will
 reproduce it here.
 \begin{codesample2}
-  perl -pi -e 's,\\s+\$,,' filename
+  perl -pi -e 's,[ \textbackslash{}t]+\$,,' filename
 \end{codesample2}
 
 \section{Bundled hooks}

--- a/en/mq-collab.tex	Sun Dec 21 23:07:13 2008 -0500
+++ b/en/mq-collab.tex	Sat Dec 27 09:30:45 2008 -0500
@@ -275,7 +275,7 @@
   backports a piece of code to~2.6.9 will have a~\texttt{2.6.9} guard.
 \end{itemize}
 This variety of guards gives me considerable flexibility in
-qdetermining what kind of source tree I want to end up with.  For most
+determining what kind of source tree I want to end up with.  For most
 situations, the selection of appropriate guards is automated during
 the build process, but I can manually tune the guards to use for less
 common circumstances.

--- a/en/mq.tex	Sun Dec 21 23:07:13 2008 -0500
+++ b/en/mq.tex	Sat Dec 27 09:30:45 2008 -0500
@@ -525,7 +525,7 @@
 modifies \filename{foo} with six hunks, and one of them fails to
 apply, you will have: an unmodified \filename{foo.orig}, a
 \filename{foo.rej} containing one hunk, and \filename{foo}, containing
-the changes made by the five successful five hunks.
+the changes made by the five successful hunks.
 
 \subsection{Some quirks of patch representation}
 

--- a/en/template.tex	Sun Dec 21 23:07:13 2008 -0500
+++ b/en/template.tex	Sat Dec 27 09:30:45 2008 -0500
@@ -244,7 +244,7 @@
   date using the same format used in email headers.  Yields a string
   like ``\Verb+Mon, 04 Sep 2006 15:13:13 -0700+''.
 \item[\tplkwfilt{node}{short}] Changeset hash.  Yield the short form
-  of a changeset hash, i.e.~a 12-byte hexadecimal string.
+  of a changeset hash, i.e.~a 12-character hexadecimal string.
 \item[\tplkwfilt{date}{shortdate}] \tplkword{date} keyword.  Render
   the year, month, and day of the date.  Yields a string like
   ``\Verb+2006-09-04+''.
@@ -452,7 +452,7 @@
 \item Subversion's output includes a count in the header of the number
   of lines in the commit message.  We cannot replicate this in
   Mercurial; the templating engine does not currently provide a filter
-  that counts the number of items it is passed.
+  that counts the number of lines the template generates.
 \end{itemize}
 It took me no more than a minute or two of work to replace literal
 text from an example of Subversion's output with some keywords and