Fix #2288.  Fix #2289.

Resolve links to "canonical" location of classes to "api" location of
classes so that Bases and inheritance diagrams work.
Shorter and more legible inheritance diagrams
Merge pull request #2292 from mdboom/doc/shorter-inheritance-diagrams

More legible inheritance diagrams