hgbook
diff en/ch06-collab.xml @ 579:80928ea6e7ae
Add the ability to include text files and have them XML-mangled.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue Mar 17 21:47:12 2009 -0700 (2009-03-17) |
parents | 13513d2a128d |
children | 8366882f67f2 |
line diff
1.1 --- a/en/ch06-collab.xml Mon Mar 09 23:37:29 2009 -0700 1.2 +++ b/en/ch06-collab.xml Tue Mar 17 21:47:12 2009 -0700 1.3 @@ -536,8 +536,8 @@ 1.4 </listitem> 1.5 <listitem><para>The <quote>:22</quote> identifies the port 1.6 number to connect to the server on. The default port is 1.7 - 22, so you only need to specify this part if you're 1.8 - <emphasis>not</emphasis> using port 22.</para> 1.9 + 22, so you only need to specify a colon and port number if 1.10 + you're <emphasis>not</emphasis> using port 22.</para> 1.11 </listitem> 1.12 <listitem><para>The remainder of the URL is the local path to 1.13 the repository on the server.</para> 1.14 @@ -597,8 +597,8 @@ 1.15 example, if you're using PuTTY, you'll need to use the 1.16 <command>plink</command> command as a command-line ssh 1.17 client.</para> 1.18 - <programlisting>[ui] ssh = C:/path/to/plink.exe -ssh -i 1.19 - "C:/path/to/my/private/key"</programlisting> 1.20 + <programlisting>[ui] 1.21 +ssh = C:/path/to/plink.exe -ssh -i "C:/path/to/my/private/key"</programlisting> 1.22 1.23 <note> 1.24 <para> The path to <command>plink</command> shouldn't contain 1.25 @@ -840,15 +840,17 @@ 1.26 turns on compression. You can easily edit your <filename 1.27 role="special"> /.hgrc</filename>\ to enable compression for 1.28 all of Mercurial's uses of the ssh protocol.</para> 1.29 - <programlisting>[ui] ssh = ssh -C</programlisting> 1.30 + <programlisting>[ui] 1.31 +ssh = ssh -C</programlisting> 1.32 1.33 <para>If you use <command>ssh</command>, you can configure it to 1.34 always use compression when talking to your server. To do 1.35 this, edit your <filename 1.36 role="special">.ssh/config</filename> file (which may not 1.37 yet exist), as follows.</para> 1.38 - <programlisting>Host hg Compression yes HostName 1.39 - hg.example.com</programlisting> 1.40 + <programlisting>Host hg 1.41 + Compression yes 1.42 + HostName hg.example.com</programlisting> 1.43 <para>This defines an alias, <literal>hg</literal>. When you 1.44 use it on the <command>ssh</command> command line or in a 1.45 Mercurial <literal>ssh</literal>-protocol URL, it will cause 1.46 @@ -936,8 +938,8 @@ 1.47 <para>You'll need to copy this script into your <filename 1.48 class="directory">public_html</filename> directory, and 1.49 ensure that it's executable.</para> 1.50 - <programlisting>cp .../hgweb.cgi ~/public_html chmod 755 1.51 - ~/public_html/hgweb.cgi</programlisting> 1.52 + <programlisting>cp .../hgweb.cgi ~/public_html 1.53 +chmod 755 ~/public_html/hgweb.cgi</programlisting> 1.54 <para>The <literal>755</literal> argument to 1.55 <command>chmod</command> is a little more general than just 1.56 making the script executable: it ensures that the script is 1.57 @@ -986,9 +988,9 @@ 1.58 class="directory">public_html</filename> directory, and 1.59 read files under the latter too. Here's a quick recipe to 1.60 help you to make your permissions more appropriate.</para> 1.61 - <programlisting>chmod 755 ~ find ~/public_html -type d -print0 1.62 - | xargs -0r chmod 755 find ~/public_html -type f -print0 | 1.63 - xargs -0r chmod 644</programlisting> 1.64 + <programlisting>chmod 755 ~ 1.65 +find ~/public_html -type d -print0 | xargs -0r chmod 755 1.66 +find ~/public_html -type f -print0 | xargs -0r chmod 644</programlisting> 1.67 1.68 <para>The other possibility with permissions is that you might 1.69 get a completely empty window when you try to load the 1.70 @@ -1001,6 +1003,9 @@ 1.71 of CGI programs in your per-user web directory. Here's 1.72 Apache's default per-user configuration from my Fedora 1.73 system.</para> 1.74 + 1.75 + &ch06-apache-config.lst; 1.76 + 1.77 <programlisting><Directory /home/*/public_html> 1.78 AllowOverride FileInfo AuthConfig Limit Options MultiViews 1.79 Indexes SymLinksIfOwnerMatch IncludesNoExec <Limit GET