--- a/doc/manual.docbook	Thu Oct 15 10:24:50 2009 +0100
+++ b/doc/manual.docbook	Thu Oct 15 10:30:05 2009 +0100
@@ -152,8 +152,7 @@
 class='directory'>keys/widget/pat</filename> directory in <literal>hgadmin</literal>.  Now mercurial-server knows about Pat's key, but will give Pat no access to anything because the key is not under either <filename
 class='directory'>keys/root</filename> or <filename
 class='directory'>keys/users</filename>.  To grant this key access, we must give mercurial-server a new access rule, so we create a file in <literal>hgadmin</literal> called <filename>access.conf</filename>, with the following contents:</para>
-<programlisting>
-    write repo=widget user=widget/**
+<programlisting>write repo=widget user=widget/**
 </programlisting>
 <para>
 Pat will have read and write access as soon as we add, commit, and push these files.
@@ -161,8 +160,7 @@
 <para>
 Each line of <filename>access.conf</filename> has the following syntax:
 </para>
-<programlisting>
-<replaceable>rule</replaceable> <replaceable>condition</replaceable> <replaceable>condition...</replaceable>
+<programlisting><replaceable>rule</replaceable> <replaceable>condition</replaceable> <replaceable>condition...</replaceable>
 </programlisting>
 <para>
 Blank lines and lines that start with <literal>#</literal> are ignored. Rule is one of
@@ -187,10 +185,9 @@
 <para>
 By default, <filename>/etc/mercurial-server/access.conf</filename> has the following rules:
 </para>
-<programlisting>
-    init user=root/**
-    deny repo=hgadmin
-    write user=users/**
+<programlisting>init user=root/**
+deny repo=hgadmin
+write user=users/**
 </programlisting>
 <para>
 These rules ensure that root users can do any operation on any repository, that no other users can access the <literal>hgadmin</literal> repository, and that those with keys in <filename class='directory'>keys/users</filename> can read or write to any repository but not create repositories.
@@ -318,9 +315,8 @@
 rule and a file condition: any user who has access to a repository can read
 all of it and its full history. Such a rule can only have the effect of
 masking a later "write" rule, as in this example:</para>
-<programlisting>
-   read repo=specialrepo file=dontwritethis
-   write repo=specialrepo
+<programlisting>read repo=specialrepo file=dontwritethis
+write repo=specialrepo
 </programlisting>
 <para>
 allows all users to read specialrepo, and to write to all files
@@ -338,18 +334,16 @@
 to write to all the files they can write to on any branch. In other words,
 something like this will have the intended effect:
 </para>
-<programlisting>
-   write user=docs/* branch=docs file=docs/*
+<programlisting>write user=docs/* branch=docs file=docs/*
 </programlisting>
 <para>
 But something like this will not have the intended effect; it will
 effectively allow these users to write to any file on any branch, by
 writing it to "docs" first:
 </para>
-<programlisting>
-  write user=docs/* branch=docs
-  write user=docs/* file=docs/*
-  read user=docs/*
+<programlisting>write user=docs/* branch=docs
+write user=docs/* file=docs/*
+read user=docs/*
 </programlisting>
 </listitem>
 </itemizedlist>