# HG changeset patch
# User Raphael Borun Das Gupta <hg@raphael.dasgupta.ch>
# Date 1240069554 -7200
# Node ID 743dc55775fef62bd87e178f3bb9de980fbc5027
# Parent  83540574ee49df74141d5c36ec9929ac3efdc502# Parent  29f0f79cf6146b747b2cbc9afe658f6b23ee6810
Merged upstream

diff -r 29f0f79cf614 -r 743dc55775fe en/ch05-collab.xml
--- a/en/ch05-collab.xml	Thu Apr 16 23:46:45 2009 -0700
+++ b/en/ch05-collab.xml	Sat Apr 18 17:45:54 2009 +0200
@@ -1032,11 +1032,11 @@
 	<title>What could <emphasis>possibly</emphasis> go
 	  wrong?</title>
 
-	<para id="x_4c7">Once you've copied the CGI script into place, go into a
-	  web browser, and try to open the URL <ulink
-	    url="http://myhostname/
-	    myuser/hgweb.cgi">http://myhostname/
-	    myuser/hgweb.cgi</ulink>, <emphasis>but</emphasis> brace
+	<para id="x_4c7">Once you've copied the CGI script into place,
+	  go into a web browser, and try to open the URL <ulink
+	    url="http://myhostname/myuser/hgweb.cgi"
+	    >http://myhostname/myuser/hgweb.cgi</ulink>,
+	  <emphasis>but</emphasis> brace
 	  yourself for instant failure.  There's a high probability
 	  that trying to visit this URL will fail, and there are many
 	  possible reasons for this.  In fact, you're likely to
@@ -1187,9 +1187,10 @@
 chmod 755 ~/public_html ~/public_html/hgwebdir.cgi</programlisting>
 
       <para id="x_4d7">With basic configuration out of the way, try to
-	visit <ulink url="http://myhostname/
-	  myuser/hgwebdir.cgi">http://myhostname/
-	  myuser/hgwebdir.cgi</ulink> in your browser.  It should
+	visit <ulink
+	  url="http://myhostname/myuser/hgwebdir.cgi"
+	  >http://myhostname/ myuser/hgwebdir.cgi</ulink>
+	in your	browser.  It should
 	display an empty list of repositories.  If you get a blank
 	window or error message, try walking through the list of
 	potential problems in <xref
@@ -1229,12 +1230,12 @@
 	  class="directory">/my/root</filename> from the name, and
 	publish the repository with a virtual path of <filename
 	  class="directory">this/repo</filename>.  If the base URL for
-	our CGI script is <ulink url="http://myhostname/
-	  myuser/hgwebdir.cgi">http://myhostname/
-	  myuser/hgwebdir.cgi</ulink>, the complete URL for that
-	repository will be <ulink url="http://myhostname/
-	  myuser/hgwebdir.cgi/this/repo">http://myhostname/
-	  myuser/hgwebdir.cgi/this/repo</ulink>.</para>
+	our CGI script is <ulink
+	  url="http://myhostname/myuser/hgwebdir.cgi"
+	  >http://myhostname/myuser/hgwebdir.cgi</ulink>, the complete URL
+	for that repository will be <ulink
+	  url="http://myhostname/myuser/hgwebdir.cgi/this/repo"
+	  >http://myhostname/myuser/hgwebdir.cgi/this/repo</ulink>.</para>
 
       <para id="x_4dc">If we replace <filename
 	  class="directory">/my/root</filename> on the left hand side