1.1 --- a/en/ch05-collab.xml	Thu Apr 16 23:45:07 2009 -0700
     1.2 +++ b/en/ch05-collab.xml	Sat Apr 18 10:09:11 2009 +0800
     1.3 @@ -48,27 +48,27 @@
     1.4        to your own repositories, there are several good ways to do
     1.5        this.</para>
     1.6  
     1.7 -    <para>The easiest and fastest way to get started in an informal
     1.8 +    <para id="x_69d">The easiest and fastest way to get started in an informal
     1.9        environment is to use the <command role="hg-cmd">hg
    1.10  	serve</command> command, which is best suited to short-term
    1.11        <quote>lightweight</quote> serving.  See <xref
    1.12  	linkend="sec:collab:serve"/> below for details of how to use
    1.13        this command.</para>
    1.14  
    1.15 -    <para>For longer-lived repositories that you'd like to have
    1.16 +    <para id="x_69e">For longer-lived repositories that you'd like to have
    1.17        permanently available, there are several public hosting services
    1.18        available.</para>
    1.19  
    1.20      <itemizedlist>
    1.21        <listitem>
    1.22 -	<para>Bitbucket, at <ulink
    1.23 +	<para id="x_69f">Bitbucket, at <ulink
    1.24  	    url="http://bitbucket.org/">http://bitbucket.org/</ulink>,
    1.25  	  provides free hosting for open source projects, and paid
    1.26  	  hosting for commercial projects.</para>
    1.27        </listitem>
    1.28      </itemizedlist>
    1.29  
    1.30 -    <para>If you would prefer to host your own repositories, Mercurial
    1.31 +    <para id="x_6a0">If you would prefer to host your own repositories, Mercurial
    1.32        has built-in support for several popular hosting technologies,
    1.33        most notably CGI (Common Gateway Interface), and WSGI (Web
    1.34        Services Gateway Interface).  See <xref
    1.35 @@ -198,19 +198,19 @@
    1.36      <sect2>
    1.37        <title>A hosted central repository</title>
    1.38  
    1.39 -      <para>A wonderful thing about public hosting services like
    1.40 +      <para id="x_6a1">A wonderful thing about public hosting services like
    1.41  	<ulink url="http://bitbucket.org/">Bitbucket</ulink> is that
    1.42  	not only do they handle the fiddly server configuration
    1.43  	details, such as user accounts, authentication, and secure
    1.44  	wire protocols, they provide additional infrastructure to make
    1.45  	this model work well.</para>
    1.46  
    1.47 -      <para>For instance, a well-engineered hosting service will let
    1.48 +      <para id="x_6a2">For instance, a well-engineered hosting service will let
    1.49  	people clone their own copies of a repository with a single
    1.50  	click.  This lets people work in separate spaces and share
    1.51  	their changes when they're ready.</para>
    1.52  
    1.53 -      <para>In addition, a good hosting service will let people
    1.54 +      <para id="x_6a3">In addition, a good hosting service will let people
    1.55  	communicate with each other, for instance to say <quote>there
    1.56  	  are changes ready for you to review in this
    1.57  	  tree</quote>.</para>
    1.58 @@ -643,7 +643,7 @@
    1.59        <tip>
    1.60  	<title>Key pairs are not mandatory</title>
    1.61  
    1.62 -	<para>Mercurial knows nothing about ssh authentication or key
    1.63 +	<para id="x_6a4">Mercurial knows nothing about ssh authentication or key
    1.64  	  pairs.  You can, if you like, safely ignore this section and
    1.65  	  the one that follows until you grow tired of repeatedly
    1.66  	  typing ssh passwords.</para>
    1.67 @@ -651,10 +651,10 @@
    1.68  
    1.69        <itemizedlist>
    1.70  	<listitem>
    1.71 -	  <para>On a Unix-like system, the
    1.72 +	  <para id="x_6a5">On a Unix-like system, the
    1.73  	    <command>ssh-keygen</command> command will do the
    1.74  	    trick.</para>
    1.75 -	  <para>On Windows, if you're using TortoiseHg, you may need
    1.76 +	  <para id="x_6a6">On Windows, if you're using TortoiseHg, you may need
    1.77  	    to download a command named <command>puttygen</command>
    1.78  	    from <ulink
    1.79  	      url="http://www.chiark.greenend.org.uk/~sgtatham/putty">the 
    1.80 @@ -716,7 +716,7 @@
    1.81  	    to the agent's store.</para>
    1.82  	</listitem>
    1.83  	<listitem>
    1.84 -	  <para>On Windows, if you're using TortoiseHg, the
    1.85 +	  <para id="x_6a7">On Windows, if you're using TortoiseHg, the
    1.86  	    <command>pageant</command> command acts as the agent.  As
    1.87  	    with <command>puttygen</command>, you'll need to <ulink
    1.88  	      url="http://www.chiark.greenend.org.uk/%7Esgtatham/putty/download.html">download 
    1.89 @@ -928,7 +928,7 @@
    1.90    <sect1 id="sec:collab:cgi">
    1.91      <title>Serving over HTTP using CGI</title>
    1.92  
    1.93 -    <para>The simplest way to host one or more repositories in a
    1.94 +    <para id="x_6a8">The simplest way to host one or more repositories in a
    1.95        permanent way is to use a web server and Mercurial's CGI
    1.96        support.</para>
    1.97  
    1.98 @@ -952,7 +952,7 @@
    1.99  	plenty of mistakes, and to spend a lot of time reading your
   1.100  	server's error logs.</para>
   1.101  
   1.102 -      <para>If you don't have a strong stomach for tweaking
   1.103 +      <para id="x_6a9">If you don't have a strong stomach for tweaking
   1.104  	configurations over and over, or a compelling need to host
   1.105  	your own services, you might want to try one of the public
   1.106  	hosting services that I mentioned earlier.</para>
   1.107 @@ -1394,25 +1394,25 @@
   1.108  	    ships with several web templates.</para>
   1.109  	  <itemizedlist>
   1.110  	    <listitem>
   1.111 -	      <para><literal>coal</literal> is monochromatic.</para>
   1.112 +	      <para id="x_6aa"><literal>coal</literal> is monochromatic.</para>
   1.113  	    </listitem>
   1.114  	    <listitem>
   1.115 -	      <para><literal>gitweb</literal> emulates the visual
   1.116 +	      <para id="x_6ab"><literal>gitweb</literal> emulates the visual
   1.117  		style of git's web interface.</para>
   1.118  	    </listitem>
   1.119  	    <listitem>
   1.120 -	      <para><literal>monoblue</literal> uses solid blues and
   1.121 +	      <para id="x_6ac"><literal>monoblue</literal> uses solid blues and
   1.122  		greys.</para>
   1.123  	    </listitem>
   1.124  	    <listitem>
   1.125 -	      <para><literal>paper</literal> is the default.</para>
   1.126 +	      <para id="x_6ad"><literal>paper</literal> is the default.</para>
   1.127  	    </listitem>
   1.128  	    <listitem>
   1.129 -	      <para><literal>spartan</literal> was the default for a
   1.130 +	      <para id="x_6ae"><literal>spartan</literal> was the default for a
   1.131  		long time.</para>
   1.132  	    </listitem>
   1.133  	  </itemizedlist>
   1.134 -	  <para>You can
   1.135 +	  <para id="x_6af">You can
   1.136  	    also specify a custom template of your own; see 
   1.137  	    <xref linkend="chap:template"/> for details. Here, you can
   1.138  	    see how to enable the <literal>gitweb</literal>
   1.139 @@ -1523,12 +1523,12 @@
   1.140    <sect1>
   1.141      <title>System-wide configuration</title>
   1.142  
   1.143 -    <para>On Unix-like systems shared by multiple users (such as a
   1.144 +    <para id="x_6b0">On Unix-like systems shared by multiple users (such as a
   1.145        server to which people publish changes), it often makes sense to
   1.146        set up some global default behaviors, such as what theme to use
   1.147        in web interfaces.</para>
   1.148  
   1.149 -    <para>If a file named <filename>/etc/mercurial/hgrc</filename>
   1.150 +    <para id="x_6b1">If a file named <filename>/etc/mercurial/hgrc</filename>
   1.151        exists, Mercurial will read it at startup time and apply any
   1.152        configuration settings it finds in that file.  It will also look
   1.153        for files ending in a <literal>.rc</literal> extension in a
   1.154 @@ -1539,7 +1539,7 @@
   1.155      <sect2>
   1.156        <title>Making Mercurial more trusting</title>
   1.157  
   1.158 -      <para>One situation in which a global <filename>hgrc</filename>
   1.159 +      <para id="x_6b2">One situation in which a global <filename>hgrc</filename>
   1.160  	can be useful is if users are pulling changes owned by other
   1.161  	users.  By default, Mercurial will not trust most of the
   1.162  	configuration items in a <filename>.hg/hgrc</filename> file
   1.163 @@ -1548,7 +1548,7 @@
   1.164  	print a warning stating that it does not trust their
   1.165  	<filename>.hg/hgrc</filename>.</para>
   1.166  
   1.167 -      <para>If everyone in a particular Unix group is on the same team
   1.168 +      <para id="x_6b3">If everyone in a particular Unix group is on the same team
   1.169  	and <emphasis>should</emphasis> trust each other's
   1.170  	configuration settings, or we want to trust particular users,
   1.171  	we can override Mercurial's skeptical defaults by creating a