Switch to unified view

a/doc/makefile b/doc/makefile