--- a/doc/manual.docbook Mon Nov 09 17:36:33 2009 +0000
+++ b/doc/manual.docbook Tue Nov 10 11:11:56 2009 +0000
@@ -38,31 +38,17 @@
Key Authentication tutorial</link> may be helpful.
</para>
<section>
-<title>Installing mercurial-server</title>
+<title>Initial access to mercurial-server</title>
<para>
In what follows, we assume that your username is <systemitem
class="username">jay</systemitem>, that you usually sit at a machine called
-<systemitem class="systemname">spoon</systemitem> and you wish to
-install mercurial-server on <systemitem
-class="systemname">jeeves</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
+<systemitem class="systemname">spoon</systemitem> and you have
+installed mercurial-server on <systemitem
+class="systemname">jeeves</systemitem> using the package management system (see the README for more on installation). 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">jeeves</systemitem>.
</para>
-<para>First install mercurial-server on <systemitem
-class="systemname">jeeves</systemitem>:</para>
-<screen><computeroutput>jay@spoon:~$ </computeroutput><userinput>scp mercurial-server_0.6.1_amd64.deb jeeves:</userinput>
-<computeroutput>mercurial-server_0.6.1_amd64.deb 100%
-jay@spoon:~$ </computeroutput><userinput>ssh -A jeeves</userinput>
-<computeroutput>jay@jeeves:~$ </computeroutput><userinput>sudo dpkg -i mercurial-server_0.7_amd64.deb</userinput>
-<computeroutput>[sudo] password for jay:
-Selecting previously deselected package mercurial-server.
-(Reading database ... 144805 files and directories currently installed.)
-Unpacking mercurial-server (from .../mercurial-server_0.7_amd64.deb) ...
-Setting up mercurial-server (0.7) ...
-jay@jeeves:~$ </computeroutput></screen>
-<para>
-mercurial-server is now installed on the repository host. Next, we need to give you permission to access its repositories.
-</para>
-<screen><computeroutput>jay@jeeves:~$ </computeroutput><userinput>ssh-add -L > my-key</userinput>
+<screen><computeroutput>jay@spoon:~$ </computeroutput><userinput>ssh -A jeeves</userinput>
+<computeroutput>jay@jeeves:~$ </computeroutput><userinput>ssh-add -L > my-key</userinput>
<computeroutput>jay@jeeves:~$ </computeroutput><userinput>sudo mkdir -p /etc/mercurial-server/keys/root/jay</userinput>
<computeroutput>jay@jeeves:~$ </computeroutput><userinput>sudo cp my-key /etc/mercurial-server/keys/root/jay/spoon</userinput>
<computeroutput>jay@jeeves:~$ </computeroutput><userinput>sudo -u hg /usr/share/mercurial-server/refresh-auth</userinput>