1 files changed, 13 insertions, 4 deletions
diff --git a/doc/rcs/monotone.mdwn b/doc/rcs/monotone.mdwn
index d68eb1ed5..7c5497611 100644
--- a/doc/rcs/monotone.mdwn
+++ b/doc/rcs/monotone.mdwn
@@ -1,7 +1,16 @@
 [monotone](http://monotone.ca/) is a distributed revision control system.
-Ikiwiki supports storing a wiki in tla.
+Ikiwiki supports storing a wiki in Monotone and editing it using the [[cgi]] interface.
+It will use the Monotone logs to generate the [[RecentChanges]] page.
 
-This requires the Monotone perl module from the monotone contrib/ directory
-to be installed. In particlar, it needs version 0.03 or higher of that module.
-It is available from the monotone source repository at:
+The monotone support requires the Monotone perl module (from the contrib/ directory
+in the monotone source) to be installed. In particular, it needs version 0.03 or higher of that module.
+The module is available from the monotone source repository at:
 <http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone>
+
+Monotone support works, but there are still a few minor missing bits (listed here so they are not forgotten):
+ * At the moment there are no links to display diffs between revisions.  It shouldn't be hard to add links to a [ViewMTN](http://grahame.angrygoats.net/moinmoin/ViewMTN) instance, but it hasn't been done yet.
+ * The [[post-commit]] hook support, so that Ikiwiki sends change notifications when people commit using Monotone rather than the web interface, is partially implemented and untested.
+ * Documentation (this page) could be improved.
+ * If you have both a conflict and a simultaneous rename on a file, then Ikiwiki may get confused.
+
+There is also a mismatch between the way Ikiwiki handles conflicts and the way Monotone handles conflicts.  At present, if there is a conflict, then Ikiwiki will commit a revision with conflict markers before presenting it to the user.  This is ugly, but there is no clean way to fix it at present.