--- a/doc/manual.docbook Wed Oct 14 17:13:31 2009 +0100
+++ b/doc/manual.docbook Wed Oct 14 17:13:47 2009 +0100
@@ -27,14 +27,15 @@
<section>
<title>Step by step</title>
<para>
-mercurial-server authenticates users not using passwords but using <link
-xlink:href="http://sial.org/howto/openssh/publickey-auth/">SSH public
-keys</link>; everyone who wants access to a mercurial-server repository
+mercurial-server authenticates users not using passwords but using SSH
+public keys; everyone who wants access to a mercurial-server repository
will need such a key. In combination with <command>ssh-agent</command> (or
equivalents such as the Windows program <link
xlink:href="http://the.earth.li/~sgtatham/putty/0.60/htmldoc/Chapter9.html#pageant">Pageant</link>),
this means that users will not need to type in a password to access the
-repository.
+repository. If you're not familiar with SSH public keys, the <link
+xlink:href="http://sial.org/howto/openssh/publickey-auth/">OpenSSH Public
+Key Authentication tutorial</link> may be helpful.
</para>
<section>
<title>Installing mercurial-server</title>
@@ -44,9 +45,7 @@
<systemitem class="systemname">my-workstation</systemitem> and you wish to
install mercurial-server on <systemitem
class="systemname">repository-host</systemitem>. We assume that you have created your SSH public key, set up your SSH agent with this key, and that this key gives you access to <systemitem
-class="systemname">repository-host</systemitem>. If you're not familiar with SSH public keys, the <link
-xlink:href="http://sial.org/howto/openssh/publickey-auth/">OpenSSH Public
-Key Authentication tutorial</link> may be helpful.
+class="systemname">repository-host</systemitem>.
</para>
<para>First install mercurial-server on <systemitem
class="systemname">repository-host</systemitem>:</para>