1.1 --- a/en/ch05-collab.xml	Tue Apr 21 21:07:20 2009 -0700
     1.2 +++ b/en/ch05-collab.xml	Mon May 04 23:52:38 2009 -0700
     1.3 @@ -55,18 +55,12 @@
     1.4  	linkend="sec:collab:serve"/> below for details of how to use
     1.5        this command.</para>
     1.6  
     1.7 -    <para id="x_69e">For longer-lived repositories that you'd like to have
     1.8 -      permanently available, there are several public hosting services
     1.9 -      available.</para>
    1.10 -
    1.11 -    <itemizedlist>
    1.12 -      <listitem>
    1.13 -	<para id="x_69f">Bitbucket, at <ulink
    1.14 -	    url="http://bitbucket.org/">http://bitbucket.org/</ulink>,
    1.15 -	  provides free hosting for open source projects, and paid
    1.16 -	  hosting for commercial projects.</para>
    1.17 -      </listitem>
    1.18 -    </itemizedlist>
    1.19 +    <para id="x_69e">For longer-lived repositories that you'd like to
    1.20 +      have permanently available, there are several public hosting
    1.21 +      services available.  Some are free to open source projects,
    1.22 +      while others offer paid commercial hosting.  An up-to-date list
    1.23 +      is available at <ulink
    1.24 +	url="http://www.selenic.com/mercurial/wiki/index.cgi/MercurialHosting">http://www.selenic.com/mercurial/wiki/index.cgi/MercurialHosting</ulink>.</para>
    1.25  
    1.26      <para id="x_6a0">If you would prefer to host your own repositories, Mercurial
    1.27        has built-in support for several popular hosting technologies,
    1.28 @@ -827,7 +821,7 @@
    1.29  	so that they only print output if they're run interactively.
    1.30  	Otherwise these banners will at least clutter up Mercurial's
    1.31  	output.  Worse, they could potentially cause problems with
    1.32 -	running Mercurial commands remotely.  Mercurial makes tries to
    1.33 +	running Mercurial commands remotely.  Mercurial tries to
    1.34  	detect and ignore banners in non-interactive
    1.35  	<command>ssh</command> sessions, but it is not foolproof.  (If
    1.36  	you're editing your login scripts on your server, the usual
    1.37 @@ -1107,7 +1101,7 @@
    1.38  	  directions inside it to correctly set your
    1.39  	  <envar>PYTHONPATH</envar> environment variable.</para>
    1.40  
    1.41 -	<para id="x_4cf">Finally, you are <emphasis>certain</emphasis> to by
    1.42 +	<para id="x_4cf">Finally, you are <emphasis>certain</emphasis> to be
    1.43  	  served with another colourful Python backtrace: this one
    1.44  	  will complain that it can't find <filename
    1.45  	    class="directory">/path/to/repository</filename>.  Edit