1.1 --- a/en/ch01-intro.xml	Thu Feb 19 20:49:46 2009 -0800
     1.2 +++ b/en/ch01-intro.xml	Thu Mar 05 21:52:23 2009 +0200
     1.3 @@ -129,7 +129,7 @@
     1.4        administrator.</para>
     1.5  
     1.6      <para>Walter Tichy developed a free alternative to SCCS in the
     1.7 -      early 1980s; he called his program RCS (Revison Control System).
     1.8 +      early 1980s; he called his program RCS (Revision Control System).
     1.9        Like SCCS, RCS required developers to work in a single shared
    1.10        workspace, and to lock files to prevent multiple people from
    1.11        modifying them simultaneously.</para>
    1.12 @@ -343,7 +343,7 @@
    1.13  	  to retain tight control over their projects, and they
    1.14  	  believe that centralised tools give them this control.
    1.15  	  However, if you're of this belief, and you publish your CVS
    1.16 -	  or Subversion repositories publically, there are plenty of
    1.17 +	  or Subversion repositories publicly, there are plenty of
    1.18  	  tools available that can pull out your entire project's
    1.19  	  history (albeit slowly) and recreate it somewhere that you
    1.20  	  don't control.  So while your control in this case is

     2.1 --- a/en/ch06-collab.xml	Thu Feb 19 20:49:46 2009 -0800
     2.2 +++ b/en/ch06-collab.xml	Thu Mar 05 21:52:23 2009 +0200
     2.3 @@ -974,7 +974,7 @@
     2.4  	<para>The other possibility with permissions is that you might
     2.5  	  get a completely empty window when you try to load the
     2.6  	  script.  In this case, it's likely that your access
     2.7 -	  permissions are \emph{too permissive}.  Apache's
     2.8 +	  permissions are <emphasis>too permissive</emphasis>.  Apache's
     2.9  	  <literal>suexec</literal> subsystem won't execute a script
    2.10  	  that's group- or world-writable, for example.</para>
    2.11  

     3.1 --- a/en/ch07-filenames.xml	Thu Feb 19 20:49:46 2009 -0800
     3.2 +++ b/en/ch07-filenames.xml	Thu Mar 05 21:52:23 2009 +0200
     3.3 @@ -168,7 +168,7 @@
     3.4        <para>A <quote><literal>{</literal></quote> begins a group of
     3.5  	subpatterns, where the whole group matches if any subpattern
     3.6  	in the group matches.  The <quote><literal>,</literal></quote>
     3.7 -	character separates subpatterns, and <quote>\texttt{}}</quote>
     3.8 +	character separates subpatterns, and <quote><literal>}</literal></quote>
     3.9  	ends the group. <!-- &interaction.filenames.glob.group;
    3.10  	--></para>
    3.11  

     4.1 --- a/en/ch10-hook.xml	Thu Feb 19 20:49:46 2009 -0800
     4.2 +++ b/en/ch10-hook.xml	Thu Mar 05 21:52:23 2009 +0200
     4.3 @@ -1307,8 +1307,8 @@
     4.4  	<title>Testing and troubleshooting</title>
     4.5  
     4.6  	<para>Do not forget that by default, the <literal
     4.7 -	    role="hg-ext">notify</literal> extension \emph{will not
     4.8 -	  send any mail} until you explicitly configure it to do so,
     4.9 +		role="hg-ext">notify</literal> extension <emphasis>will not
    4.10 +	  send any mail</emphasis> until you explicitly configure it to do so,
    4.11  	  by setting <envar role="rc-item-notify">test</envar> to
    4.12  	  <literal>false</literal>.  Until you do that, it simply
    4.13  	  prints the message it <emphasis>would</emphasis> send.

     5.1 --- a/en/ch11-template.xml	Thu Feb 19 20:49:46 2009 -0800
     5.2 +++ b/en/ch11-template.xml	Thu Mar 05 21:52:23 2009 +0200
     5.3 @@ -119,7 +119,7 @@
     5.4        been replaced in the output with the description of each
     5.5        changeset.  Every time Mercurial finds text enclosed in curly
     5.6        braces (<quote><literal>{</literal></quote> and
     5.7 -      <quote>\texttt{}}</quote>), it will try to replace the braces
     5.8 +      <quote><literal>}</literal></quote>), it will try to replace the braces
     5.9        and text with the expansion of whatever is inside.  To print a
    5.10        literal curly brace, you must escape it, as described in section
    5.11        <xref
    5.12 @@ -624,7 +624,7 @@
    5.13  	from the output produced by Subversion.</para>
    5.14        <itemizedlist>
    5.15  	<listitem><para>Subversion prints a <quote>readable</quote>
    5.16 -	    date (the <quote>\texttt{Wed, 27 Sep 2006}</quote> in the
    5.17 +	    date (the <quote><literal>Wed, 27 Sep 2006</literal></quote> in the
    5.18  	    example output above) in parentheses.  Mercurial's
    5.19  	    templating engine does not provide a way to display a date
    5.20  	    in this format without also printing the time and time

     6.1 --- a/en/ch14-hgext.xml	Thu Feb 19 20:49:46 2009 -0800
     6.2 +++ b/en/ch14-hgext.xml	Thu Mar 05 21:52:23 2009 +0200
     6.3 @@ -417,7 +417,7 @@
     6.4      <para>Mercurial makes it easy to send changes over email for
     6.5        review or application, via its <literal
     6.6  	role="hg-ext">patchbomb</literal> extension.  The extension is
     6.7 -      so namd because changes are formatted as patches, and it's usual
     6.8 +      so named because changes are formatted as patches, and it's usual
     6.9        to send one changeset per email message.  Sending a long series
    6.10        of changes by email is thus much like <quote>bombing</quote> the
    6.11        recipient's inbox, hence <quote>patchbomb</quote>.</para>