--- a/mercurial/help.py Wed Nov 01 16:07:33 2017 -0400
+++ b/mercurial/help.py Wed Nov 01 13:24:08 2017 -0500
@@ -202,7 +202,7 @@
loaddoc('censor', subdir='internals')),
(['changegroups'], _('Changegroups'),
loaddoc('changegroups', subdir='internals')),
- (['config'], _('Config Register'),
+ (['config'], _('Config Registrar'),
loaddoc('config', subdir='internals')),
(['requirements'], _('Repository Requirements'),
loaddoc('requirements', subdir='internals')),
--- a/mercurial/help/internals/config.txt Wed Nov 01 16:07:33 2017 -0400
+++ b/mercurial/help/internals/config.txt Wed Nov 01 13:24:08 2017 -0500
@@ -88,7 +88,7 @@
Supporting older versions
-------------------------
-The registry was introduced in Mercurial 4.3, and the ``generic`` parameter was
+The registrar was introduced in Mercurial 4.3, and the ``generic`` parameter was
introduced in 4.4. Starting with Mercurial 4.4, all core options were registered
and developer warnings are emitted when accessing unregistered option.