# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1250897848 -7200
# Node ID 4481ba0957c5a2f0b2863c2b485eee7d92bb3b9e
# Parent  b47fa638bfc7d6e5185f49113a6c418fbe6cf0b3# Parent  68f3937888951aad62f01a513c67ee1a176afbda
Merge with crew-stable

diff -r b47fa638bfc7 -r 4481ba0957c5 doc/hgrc.5.txt
--- a/doc/hgrc.5.txt	Fri Aug 21 16:58:30 2009 +0200
+++ b/doc/hgrc.5.txt	Sat Aug 22 01:37:28 2009 +0200
@@ -100,6 +100,12 @@
 Lines beginning with "``#``" or "``;``" are ignored and may be used to provide
 comments.
 
+A line of the form "``%include file``" will include ``file`` into the
+current configuration file. The inclusion is recursive, which means
+that included files can include other files. Filenames are relative to
+the configuration file in which the ``%include`` directive is found.
+
+
 SECTIONS
 --------