Align docs to what we currently recommend as best practices.