Review HACKING docs

Re-merging #6383 (with a small change, which prevents re-reversion). The unfortunate series of miscommits is due to miscommunication on my end.