--- a/doc/manual.docbook Thu Oct 15 10:38:13 2009 +0100
+++ b/doc/manual.docbook Thu Oct 15 10:45:08 2009 +0100
@@ -219,12 +219,12 @@
</para>
<itemizedlist>
<listitem>
-Users may not need the sophistication of access control via mercurial; for these users updating <filename
+Some users may not need the convenience of access control via mercurial; for these users updating <filename
class='directory'>/etc/mercurial-server</filename> may offer a simpler route.
</listitem>
<listitem>
-<filename
-class='directory'>/etc/mercurial-server</filename> is suitable for management by some other route, such as with <link
+<filename class='directory'>/etc/mercurial-server</filename> is suitable
+for management with tools such as <link
xlink:href="http://reductivelabs.com/products/puppet">Puppet</link>
</listitem>
<listitem>
@@ -236,11 +236,11 @@
</listitem>
</itemizedlist>
<para>
-Rules in <filename>/etc/mercurial-server/access.conf</filename> take precedence over those in <literal>hgadmin</literal>, and obviously keys in <filename class='directory'>/etc/mercurial-server/keys</filename> cannot be affected by changes to <literal>hgadmin</literal>.
+Rules in <filename>/etc/mercurial-server/access.conf</filename> are checked before those in <literal>hgadmin</literal>, and keys in <filename class='directory'>/etc/mercurial-server/keys</filename> will be present no matter how <literal>hgadmin</literal> changes.
</para>
<para>
We anticipate that once mercurial-server is successfully installed and
-working most users will want to use <literal>hgadmin</literal> for most
+working you will usually want to use <literal>hgadmin</literal> for most
access control tasks. Once you have the right keys and
<filename>access.conf</filename> set up in <literal>hgadmin</literal>, you
can delete <filename>/etc/mercurial-server/access.conf</filename> and all