--- a/mercurial/help/config.txt Sun Nov 20 19:14:36 2011 +0100
+++ b/mercurial/help/config.txt Fri Nov 18 12:04:31 2011 +0100
@@ -227,6 +227,24 @@
processed before shell aliases and will thus not be passed to
aliases.
+
+``annotate``
+""""""""
+
+Settings used when displaying file annotations. All values are
+Booleans and default to False. See ``diff`` section for related
+options for the diff command.
+
+``ignorews``
+ Ignore white space when comparing lines.
+
+``ignorewsamount``
+ Ignore changes in the amount of white space.
+
+``ignoreblanklines``
+ Ignore changes whose lines are all blank.
+
+
``auth``
""""""""
@@ -364,8 +382,9 @@
``diff``
""""""""
-Settings used when displaying diffs. Everything except for ``unified`` is a
-Boolean and defaults to False.
+Settings used when displaying diffs. Everything except for ``unified``
+is a Boolean and defaults to False. See ``annotate`` section for
+related options for the annotate command.
``git``
Use git extended diff format.