Rework documentation for pull request 600