Recommit the documentation changes

This reverts commit 91895c2420133629787a75f57a566cc203eaf0cf.