From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jul 2008 20:05:10 +0000 (-0400)
Subject: web commit by XTaran: Example hgrc, some markup, one correction of one of my previous... 
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/be16270a09329f51ff85f9d9def6058b38c27b6e?hp=f6e01e53fdbfd8369ffd5860424cbb02b4dbc39c

web commit by XTaran: Example hgrc, some markup, one correction of one of my previous changes
---

diff --git a/doc/rcs/mercurial.mdwn b/doc/rcs/mercurial.mdwn
index 020edfc12..b4baf07f4 100644
--- a/doc/rcs/mercurial.mdwn
+++ b/doc/rcs/mercurial.mdwn
@@ -2,9 +2,17 @@
 system developed by Matt Mackall. Ikiwiki supports storing a wiki in a
 mercurial repository.
 
-Ikiwiki can run as a post-commit and/or install hook to update a wiki whenever commits or remote pushes
+Ikiwiki can run as a `post-commit` and/or `incoming` hook to update a wiki whenever commits or remote pushes
 come in. When running as a [[cgi]] with Mercurial, ikiwiki automatically
 commits edited pages, and uses the Mercurial history to generate the
 [[RecentChanges]] page.
 
+Example for a `.hg/hgrc` file in `$SRCDIR`:
+
+    [hooks]
+    post-commit = /home/abe/bin/rebuildwiki
+    incoming = /home/abe/bin/rebuildwiki
+
+Do not use `commit` or `precommit` hooks or ikiwiki will run into a dead lock when committing in `$SRCDIR`
+
 See also [[todo/mercurial|todo/mercurial]]