Fix the problem addressed by patch

[ 819012 ] Fix for former/latter confusion in Extending documentation

although not by using supplied patch.

Though this backport actually includes the fix that caused the problem
in the first place!