--- a/doc/manual.docbook	Wed Oct 14 18:05:39 2009 +0100
+++ b/doc/manual.docbook	Thu Oct 15 10:24:50 2009 +0100
@@ -49,8 +49,7 @@
 </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>
+<screen><computeroutput>jay@my-workstation:~$ </computeroutput><userinput>scp mercurial-server_0.6.1_amd64.deb repository-host:</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>
@@ -63,13 +62,12 @@
 <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>
+<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 shell closed.
+<computeroutput>Connection to repository-host closed.
 jay@my-workstation:~$ </computeroutput></screen>
 <para>
 You can now create repositories on the remote machine and have complete
@@ -81,8 +79,7 @@
 <para>
 To store a repository on the server, clone it over.
 </para>
-<screen>
-<computeroutput>jay@my-workstation:~$ </computeroutput><userinput>cd my-mercurial-project</userinput>
+<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>
 <computeroutput>searching for changes
 remote: adding changesets
@@ -104,8 +101,7 @@
 copy of their SSH public key; we'll assume you have that key in
 <filename>~/sam-key.pub</filename>.  To manage access, you make changes to the special <literal>hgadmin</literal> repository.
 </para>
-<screen>
-<computeroutput>jay@my-workstation:~$ </computeroutput><userinput>hg clone ssh://hg@repository-host/hgadmin</userinput>
+<screen><computeroutput>jay@my-workstation:~$ </computeroutput><userinput>hg clone ssh://hg@repository-host/hgadmin</userinput>
 <computeroutput>destination directory: hgadmin
 no changes found
 updating working directory