Remove public_doc/private_doc distinction
Reduce the amount of spamming produced when running `make'

Also fix some capitalization with polymorphic variants