diff -r b29a7088b132 -r 5da43b596bac doc/manual.docbook
--- 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 @@
-Users may not need the sophistication of access control via mercurial; for these users updating /etc/mercurial-server may offer a simpler route.
-/etc/mercurial-server is suitable for management by some other route, such as with /etc/mercurial-server is suitable
+for management with tools such as Puppet
@@ -236,11 +236,11 @@
-Rules in /etc/mercurial-server/access.conf take precedence over those in hgadmin, and obviously keys in /etc/mercurial-server/keys cannot be affected by changes to hgadmin.
+Rules in /etc/mercurial-server/access.conf are checked before those in hgadmin, and keys in /etc/mercurial-server/keys will be present no matter how hgadmin changes.
We anticipate that once mercurial-server is successfully installed and
-working most users will want to use hgadmin for most
+working you will usually want to use hgadmin for most
access control tasks. Once you have the right keys and
access.conf set up in hgadmin, you
can delete /etc/mercurial-server/access.conf and all