# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 2012-05-02 11:20:06
# Node ID d7c9976b930e1fdbf8608a65462cd124977c7d53
# Parent  aef3d0d4631c6c5fcfe4b594473701fc2f2ee006
# Parent  770190bff625331da85fb0c9f996c030788a6024

merge with stable

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3941,6 +3941,9 @@ def log(ui, repo, *pats, **opts):
     See :hg:`help revisions` and :hg:`help revsets` for more about
     specifying revisions.
 
+    See :hg:`help templates` for more about pre-packaged styles and
+    specifying custom templates.
+
     Returns 0 on success.
     """
 
diff --git a/mercurial/help.py b/mercurial/help.py
--- a/mercurial/help.py
+++ b/mercurial/help.py
@@ -64,7 +64,7 @@ helptable = sorted([
     (['fileset', 'filesets'], _("Specifying File Sets"), loaddoc('filesets')),
     (['diffs'], _('Diff Formats'), loaddoc('diffs')),
     (['merge-tools'], _('Merge Tools'), loaddoc('merge-tools')),
-    (['templating', 'templates'], _('Template Usage'),
+    (['templating', 'templates', 'template', 'style'], _('Template Usage'),
      loaddoc('templates')),
     (['urls'], _('URL Paths'), loaddoc('urls')),
     (["extensions"], _("Using Additional Features"), extshelp),