Merge branch 'automarkup' into docs-next

Bring in (finally) automatic markup of function() so we need not load up
our docs with ugly c:func: annotations.