--- a/mercurial/help.py	Sat Sep 26 12:38:02 2015 +0900
+++ b/mercurial/help.py	Sat Sep 26 12:39:13 2015 +0900
@@ -220,7 +220,7 @@
 addtopicsymbols('merge-tools', '.. internaltoolsmarker',
                 filemerge.internalsdoc)
 addtopicsymbols('revsets', '.. predicatesmarker', revset.symbols)
-addtopicsymbols('templates', '.. keywordsmarker', templatekw.dockeywords)
+addtopicsymbols('templates', '.. keywordsmarker', templatekw.keywords)
 addtopicsymbols('templates', '.. filtersmarker', templatefilters.filters)
 addtopicsymbols('templates', '.. functionsmarker', templater.funcs)
 addtopicsymbols('hgweb', '.. webcommandsmarker', webcommands.commands,

--- a/mercurial/templatekw.py	Sat Sep 26 12:38:02 2015 +0900
+++ b/mercurial/templatekw.py	Sat Sep 26 12:39:13 2015 +0900
@@ -505,10 +505,5 @@
     'tags': showtags,
 }
 
-dockeywords = {
-}
-dockeywords.update(keywords)
-del dockeywords['branches']
-
 # tell hggettext to extract docstrings from these functions:
-i18nfunctions = dockeywords.values()
+i18nfunctions = keywords.values()