Merge commit 'upstream/master'

[git.ikiwiki.info.git] / doc / rcs / monotone.mdwn

diff --git a/doc/rcs/monotone.mdwn b/doc/rcs/monotone.mdwn
index f9f474291058701fe0fdd509334011aa2c5150f9..2cfcdfbf54a113d4c06971aaf63233f39780872e 100644 (file)
--- a/doc/rcs/monotone.mdwn
+++ b/doc/rcs/monotone.mdwn
@@ -11,10 +11,14 @@ The module is available from the monotone source repository at:
 
 Monotone support works, but there are still a few minor missing bits (listed here so they are not forgotten):
 
 
 Monotone support works, but there are still a few minor missing bits (listed here so they are not forgotten):
 

-* The [[post-commit]] hook support is not yet completly implemented.

 * Documentation (this page) could be improved.
 
 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.
 * Documentation (this page) could be improved.
 
 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.

+
+Also note that not all recent ikiwiki features have been implemented in the
+monotone plugin.  At the moment we're missing:
+
+  * [[todo/Untrusted_push_in_Monotone]]