# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1272208310 -7200
# Node ID c72358052e0be06741df367da0f2cfd4a505861e
# Parent  4760b17aee19220c20ca90bea33ed159b9062f32# Parent  30ae8174a5970da9023d7978e5674440f7af0c76
Merge with stable

diff -r 4760b17aee19 -r c72358052e0b doc/hgrc.5.txt
--- a/doc/hgrc.5.txt	Sun Apr 25 16:46:44 2010 +0200
+++ b/doc/hgrc.5.txt	Sun Apr 25 17:11:50 2010 +0200
@@ -110,10 +110,10 @@
 A line with ``%unset name`` will remove ``name`` from the current
 section, if it has been set previously.
 
-The values are either free-form text strings or Boolean values.
-Boolean values can be set to true using any of "1", "yes", "true", or
-"on" and to false using "0", "no", "false", or "off" (all case
-insensitive).
+The values are either free-form text strings, lists of text strings,
+or Boolean values. Lists are split on whitespace and commas. Boolean
+values can be set to true using any of "1", "yes", "true", or "on" and
+to false using "0", "no", "false", or "off" (all case insensitive).
 
 
 Sections