1.1 --- a/en/ch05-collab.xml	Sat Apr 18 17:45:54 2009 +0200
     1.2 +++ b/en/ch05-collab.xml	Tue Apr 21 21:07:20 2009 -0700
     1.3 @@ -1033,18 +1033,17 @@
     1.4  	  wrong?</title>
     1.5  
     1.6  	<para id="x_4c7">Once you've copied the CGI script into place,
     1.7 -	  go into a web browser, and try to open the URL <ulink
     1.8 -	    url="http://myhostname/myuser/hgweb.cgi"
     1.9 -	    >http://myhostname/myuser/hgweb.cgi</ulink>,
    1.10 -	  <emphasis>but</emphasis> brace
    1.11 -	  yourself for instant failure.  There's a high probability
    1.12 -	  that trying to visit this URL will fail, and there are many
    1.13 -	  possible reasons for this.  In fact, you're likely to
    1.14 -	  stumble over almost every one of the possible errors below,
    1.15 -	  so please read carefully.  The following are all of the
    1.16 -	  problems I ran into on a system running Fedora 7, with a
    1.17 -	  fresh installation of Apache, and a user account that I
    1.18 -	  created specially to perform this exercise.</para>
    1.19 +	  go into a web browser, and try to open the URL
    1.20 +	  <literal>http://myhostname/~myuser/hgweb.cgi</literal>,
    1.21 +	  <emphasis>but</emphasis> brace yourself for instant failure.
    1.22 +	  There's a high probability that trying to visit this URL
    1.23 +	  will fail, and there are many possible reasons for this.  In
    1.24 +	  fact, you're likely to stumble over almost every one of the
    1.25 +	  possible errors below, so please read carefully.  The
    1.26 +	  following are all of the problems I ran into on a system
    1.27 +	  running Fedora 7, with a fresh installation of Apache, and a
    1.28 +	  user account that I created specially to perform this
    1.29 +	  exercise.</para>
    1.30  
    1.31  	<para id="x_4c8">Your web server may have per-user directories disabled.
    1.32  	  If you're using Apache, search your config file for a
    1.33 @@ -1187,9 +1186,7 @@
    1.34  chmod 755 ~/public_html ~/public_html/hgwebdir.cgi</programlisting>
    1.35  
    1.36        <para id="x_4d7">With basic configuration out of the way, try to
    1.37 -	visit <ulink
    1.38 -	  url="http://myhostname/myuser/hgwebdir.cgi"
    1.39 -	  >http://myhostname/ myuser/hgwebdir.cgi</ulink>
    1.40 +	visit <literal>http://myhostname/~myuser/hgwebdir.cgi</literal>
    1.41  	in your	browser.  It should
    1.42  	display an empty list of repositories.  If you get a blank
    1.43  	window or error message, try walking through the list of
    1.44 @@ -1223,19 +1220,17 @@
    1.45  	remaining component of a path after this stripping has
    1.46  	occurred is called a <quote>virtual path</quote>.</para>
    1.47  
    1.48 -      <para id="x_4db">Given the example above, if we have a repository whose
    1.49 -	local path is <filename
    1.50 +      <para id="x_4db">Given the example above, if we have a
    1.51 +	repository whose local path is <filename
    1.52  	  class="directory">/my/root/this/repo</filename>, the CGI
    1.53  	script will strip the leading <filename
    1.54  	  class="directory">/my/root</filename> from the name, and
    1.55  	publish the repository with a virtual path of <filename
    1.56  	  class="directory">this/repo</filename>.  If the base URL for
    1.57 -	our CGI script is <ulink
    1.58 -	  url="http://myhostname/myuser/hgwebdir.cgi"
    1.59 -	  >http://myhostname/myuser/hgwebdir.cgi</ulink>, the complete URL
    1.60 -	for that repository will be <ulink
    1.61 -	  url="http://myhostname/myuser/hgwebdir.cgi/this/repo"
    1.62 -	  >http://myhostname/myuser/hgwebdir.cgi/this/repo</ulink>.</para>
    1.63 +	our CGI script is
    1.64 +	<literal>http://myhostname/~myuser/hgwebdir.cgi</literal>, the
    1.65 +	complete URL for that repository will be
    1.66 +	<literal>http://myhostname/~myuser/hgwebdir.cgi/this/repo</literal>.</para>
    1.67  
    1.68        <para id="x_4dc">If we replace <filename
    1.69  	  class="directory">/my/root</filename> on the left hand side