--- a/doc/manual.docbook	Thu Oct 15 12:09:00 2009 +0100
+++ b/doc/manual.docbook	Thu Oct 15 12:19:35 2009 +0100
@@ -42,33 +42,33 @@
 <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">my-workstation</systemitem> and you wish to
+<systemitem class="systemname">spoon</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>.  
+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
+class="systemname">jeeves</systemitem>.  
 </para>
 <para>First install mercurial-server on <systemitem
-class="systemname">repository-host</systemitem>:</para>
-<screen><computeroutput>jay@my-workstation:~$ </computeroutput><userinput>scp mercurial-server_0.6.1_amd64.deb repository-host:</userinput>
+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@my-workstation:~$ </computeroutput><userinput>ssh -A repository-host</userinput>
-<computeroutput>jay@repository-host:~$ </computeroutput><userinput>sudo dpkg -i mercurial-server_0.6.1_amd64.deb</userinput>
+jay@spoon:~$ </computeroutput><userinput>ssh -A jeeves</userinput>
+<computeroutput>jay@jeeves:~$ </computeroutput><userinput>sudo dpkg -i mercurial-server_0.6.1_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.6.1_amd64.deb) ...
 Setting up mercurial-server (0.6.1) ...
-jay@repository-host:~$ </computeroutput></screen>
+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@repository-host:~$ </computeroutput><userinput>ssh-add -L > my-key</userinput>
-<computeroutput>jay@repository-host:~$ </computeroutput><userinput>sudo mkdir -p /etc/mercurial-server/keys/root/jay</userinput>
-<computeroutput>jay@repository-host:~$ </computeroutput><userinput>sudo cp my-key /etc/mercurial-server/keys/root/jay/my-workstation</userinput>
-<computeroutput>jay@repository-host:~$ </computeroutput><userinput>sudo -u hg /usr/share/mercurial-server/refresh-auth</userinput>
-<computeroutput>jay@repository-host:~$ </computeroutput><userinput>exit</userinput>
-<computeroutput>Connection to repository-host closed.
-jay@my-workstation:~$ </computeroutput></screen>
+<screen><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>
+<computeroutput>jay@jeeves:~$ </computeroutput><userinput>exit</userinput>
+<computeroutput>Connection to jeeves closed.
+jay@spoon:~$ </computeroutput></screen>
 <para>
 You can now create repositories on the remote machine and have complete
 read-write access to all of them.
@@ -79,19 +79,19 @@
 <para>
 To store a repository on the server, clone it over.
 </para>
-<screen><computeroutput>jay@my-workstation:~$ </computeroutput><userinput>cd my-mercurial-project</userinput>
-<computeroutput>jay@my-workstation:~/my-mercurial-project$ </computeroutput><userinput>hg clone . ssh://hg@repository-host/repository/name</userinput>
+<screen><computeroutput>jay@spoon:~$ </computeroutput><userinput>cd my-mercurial-project</userinput>
+<computeroutput>jay@spoon:~/my-mercurial-project$ </computeroutput><userinput>hg clone . ssh://hg@jeeves/repository/name</userinput>
 <computeroutput>searching for changes
 remote: adding changesets
 remote: adding manifests
 remote: adding file changes
 remote: added 119 changesets with 284 changes to 61 files
-jay@my-workstation:~/my-mercurial-project$ </computeroutput><userinput>hg pull ssh://hg@repository-host/repository/name</userinput>
-<computeroutput>pulling from ssh://hg@repository-host/repository/name
+jay@spoon:~/my-mercurial-project$ </computeroutput><userinput>hg pull ssh://hg@jeeves/repository/name</userinput>
+<computeroutput>pulling from ssh://hg@jeeves/repository/name
 searching for changes
 no changes found
-<computeroutput>jay@my-workstation:~/my-mercurial-project$ </computeroutput><userinput>cd ..</userinput>
-jay@my-workstation:~$ </computeroutput></screen>
+<computeroutput>jay@spoon:~/my-mercurial-project$ </computeroutput><userinput>cd ..</userinput>
+jay@spoon:~$ </computeroutput></screen>
 </section>
 <section>
 <title>Adding other users</title>
@@ -102,28 +102,28 @@
 <filename>~/sam-key.pub</filename>.  To manage access, you make changes to the special <filename
 class='directory'>hgadmin</filename> repository.
 </para>
-<screen><computeroutput>jay@my-workstation:~$ </computeroutput><userinput>hg clone ssh://hg@repository-host/hgadmin</userinput>
+<screen><computeroutput>jay@spoon:~$ </computeroutput><userinput>hg clone ssh://hg@jeeves/hgadmin</userinput>
 <computeroutput>destination directory: hgadmin
 no changes found
 updating working directory
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-jay@my-workstation:~$ </computeroutput><userinput>cd hgadmin</userinput>
-<computeroutput>jay@my-workstation:~/hgadmin$ </computeroutput><userinput>mkdir -p keys/users/sam</userinput>
-<computeroutput>jay@my-workstation:~/hgadmin$ </computeroutput><userinput>cp ~/sam-key.pub keys/users/sam/their-workstation</userinput>
-<computeroutput>jay@my-workstation:~/hgadmin$ </computeroutput><userinput>hg add</userinput>
+jay@spoon:~$ </computeroutput><userinput>cd hgadmin</userinput>
+<computeroutput>jay@spoon:~/hgadmin$ </computeroutput><userinput>mkdir -p keys/users/sam</userinput>
+<computeroutput>jay@spoon:~/hgadmin$ </computeroutput><userinput>cp ~/sam-key.pub keys/users/sam/their-workstation</userinput>
+<computeroutput>jay@spoon:~/hgadmin$ </computeroutput><userinput>hg add</userinput>
 <computeroutput>adding keys/users/sam/their-workstation
-jay@my-workstation:~/hgadmin$ </computeroutput><userinput>hg commit -m "Add Sam's key'"</userinput>
-<computeroutput>jay@my-workstation:~/hgadmin$ </computeroutput><userinput>hg push</userinput>
-<computeroutput>pushing to ssh://hg@repository-host/hgadmin
+jay@spoon:~/hgadmin$ </computeroutput><userinput>hg commit -m "Add Sam's key'"</userinput>
+<computeroutput>jay@spoon:~/hgadmin$ </computeroutput><userinput>hg push</userinput>
+<computeroutput>pushing to ssh://hg@jeeves/hgadmin
 searching for changes
 remote: adding changesets
 remote: adding manifests
 remote: adding file changes
 remote: added 1 changesets with 1 changes to 1 files
-jay@my-workstation:~/hgadmin$ </computeroutput></screen>
+jay@spoon:~/hgadmin$ </computeroutput></screen>
 <para>
 Sam can now read and write to your
-<uri>ssh://hg@repository-host/repository/name</uri> repository.
+<uri>ssh://hg@jeeves/repository/name</uri> repository.
 Most other changes to access control can be made simply by making and
 pushing changes to <filename
 class='directory'>hgadmin</filename>, and you can use Mercurial to
@@ -131,7 +131,7 @@
 </para>
 <para>
 If you prefer, you could give them access by
-logging into <systemitem class="systemname">repository-host</systemitem>,
+logging into <systemitem class="systemname">jeeves</systemitem>,
 putting the key in the right place under <filename
 class='directory'>/etc/mercurial-server/keys</filename>, and re-running
 <userinput>sudo -u hg /usr/share/mercurial-server/refresh-auth</userinput>.